From f0c0a130de85303ff3acf3e2d4ddbffb303f5dad Mon Sep 17 00:00:00 2001
From: Noldor
Date: Mon, 14 Apr 2008 16:56:09 +0000
Subject: QT4 port: QIconSet (completed), objects module (w.i.p.), code clean.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1480 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
src/modules/about/aboutdialog.cpp | 3 +-
src/modules/dcc/voice.cpp | 6 +-
src/modules/logview/logviewmdiwindow.cpp | 4 +-
src/modules/objects/class_button.cpp | 32 ++-----
src/modules/objects/class_button.h | 2 -
src/modules/objects/class_buttongroup.cpp | 2 +-
src/modules/objects/class_checkbox.cpp | 2 +-
src/modules/objects/class_combobox.cpp | 36 ++++----
src/modules/objects/class_combobox.h | 2 +-
src/modules/objects/class_dialog.cpp | 3 +-
src/modules/objects/class_file.cpp | 21 ++---
src/modules/objects/class_groupbox.cpp | 4 +-
src/modules/objects/class_label.cpp | 45 ++++------
src/modules/objects/class_label.h | 2 -
src/modules/objects/class_layout.cpp | 2 +-
src/modules/objects/class_lineedit.cpp | 2 +-
src/modules/objects/class_listbox.cpp | 139 ++++++++++++++++--------------
src/modules/objects/class_listbox.h | 14 +--
src/modules/objects/class_listview.cpp | 2 +-
src/modules/objects/class_mainwindow.cpp | 2 +-
src/modules/objects/class_popupmenu.cpp | 2 +-
src/modules/objects/class_progressbar.cpp | 2 +-
src/modules/objects/class_radiobutton.cpp | 2 +-
src/modules/objects/class_tabwidget.cpp | 6 +-
src/modules/objects/class_toolbar.cpp | 2 +-
src/modules/objects/class_toolbutton.cpp | 4 +-
src/modules/objects/class_window.cpp | 2 +-
src/modules/objects/class_wizard.cpp | 2 +-
src/modules/objects/class_wrapper.cpp | 4 +-
src/modules/objects/libkviobjects.cpp | 14 +--
src/modules/objects/object_macros.h | 2 +-
src/modules/snd/libkvisnd.cpp | 8 +-
src/modules/url/libkviurl.h | 2 +-
33 files changed, 178 insertions(+), 199 deletions(-)
(limited to 'src/modules')
diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp
index 653f9cc79..5450b478d 100644
--- a/src/modules/about/aboutdialog.cpp
+++ b/src/modules/about/aboutdialog.cpp
@@ -112,6 +112,7 @@ KviAboutDialog::KviAboutDialog()
// Get info
QString infoString = "KVIrc " KVI_VERSION " '" KVI_RELEASE_NAME "'
";
+ #ifndef COMPILE_ON_WINDOWS
infoString += __tr2qs_ctx("System Name","about");
infoString += ": " KVI_BUILD_SYSTEM "
";
infoString += __tr2qs_ctx("CPU Name","about");
@@ -128,7 +129,7 @@ KviAboutDialog::KviAboutDialog()
infoString += ": " KVI_BUILD_COMPILER "
";
infoString += __tr2qs_ctx("Compiler Flags","about");
infoString += ": " KVI_BUILD_COMPILER_FLAGS;
-
+#endif
v->setText(infoString);
addTab(w,__tr2qs_ctx("Executable Informations","about"));
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index d92908953..a57dc36c5 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -682,9 +682,9 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
m_pTalkButton = new QToolButton(m_pHBox);
m_pTalkButton->setEnabled(false);
m_pTalkButton->setToggleButton(true);
- QIconSet iset;
- iset.setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)),QIconSet::Large,QIconSet::Normal,QIconSet::Off);
- iset.setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_CONNECTED)),QIconSet::Large,QIconSet::Normal,QIconSet::On);
+ QIcon iset;
+ iset.addPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)),QIcon::Normal,QIcon::Off);
+ iset.addPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_CONNECTED)),QIcon::Normal,QIcon::On);
m_pTalkButton->setIconSet(iset);
m_pTalkButton->setUsesBigPixmap(true);
connect(m_pTalkButton,SIGNAL(toggled(bool)),this,SLOT(startOrStopTalking(bool)));
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 3d24545ed..7389dd614 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -398,10 +398,10 @@ KviLogFile::KviLogFile(const QString& name)
undecoded.cutToFirst('_');
m_szName = undecoded.hexDecode(undecoded.ptr()).ptr();
- undecoded = m_szFilename.section('.',1,1).section('_',0,0);
+ undecoded = m_szFilename.section('.',1).section('_',0,0);
m_szNetwork = undecoded.hexDecode(undecoded.ptr()).ptr();
- QString szDate = m_szFilename.section('.',1,3).section('_',1,1);
+ QString szDate = m_szFilename.section('.',-4,-1).section('_',1,1);
int iYear = szDate.section('.',0,0).toInt();
int iMonth = szDate.section('.',1,1).toInt();
int iDay = szDate.section('.',2,2).toInt();
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index 296e3569a..ebde7161f 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -37,8 +37,6 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_button,"button","widget")
KVSO_REGISTER_HANDLER(KviKvsObject_button,"setOn", functionSetOn)
KVSO_REGISTER_HANDLER(KviKvsObject_button,"isOn", functionIsOn)
KVSO_REGISTER_HANDLER(KviKvsObject_button,"toggle", functionToggle)
- KVSO_REGISTER_HANDLER(KviKvsObject_button,"setIsMenuButton", functionSetIsMenuButton)
- KVSO_REGISTER_HANDLER(KviKvsObject_button,"isMenuButton", functionIsMenuButton)
KVSO_REGISTER_HANDLER(KviKvsObject_button,"clickEvent", functionclickEvent)
KVSO_REGISTER_HANDLER(KviKvsObject_button,"setImage", functionSetImage)
@@ -94,7 +92,7 @@ bool KviKvsObject_button::functionSetToggleButton(KviKvsObjectFunctionCall *c)
KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
KVSO_PARAMETERS_END(c)
if(widget())
- ((QPushButton *)widget())->setToggleButton(bEnabled);
+ ((QPushButton *)widget())->setCheckable(bEnabled);
return true;
}
bool KviKvsObject_button::functionSetOn(KviKvsObjectFunctionCall *c)
@@ -104,31 +102,15 @@ bool KviKvsObject_button::functionSetOn(KviKvsObjectFunctionCall *c)
KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
KVSO_PARAMETERS_END(c)
if(widget())
- ((QPushButton *)widget())->setOn(bEnabled);
+ ((QPushButton *)widget())->setChecked(bEnabled);
return true;
}
-// FIX ME
-bool KviKvsObject_button::functionSetIsMenuButton(KviKvsObjectFunctionCall *c)
-{
- bool bEnabled;
- KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
- KVSO_PARAMETERS_END(c)
- /*if(widget())
- ((QPushButton *)widget())->setIsMenuButton(bEnabled);
- */
- return true;
-}
-bool KviKvsObject_button::functionIsMenuButton(KviKvsObjectFunctionCall *c)
-{
- if (widget()) c->returnValue()->setBoolean(((QPushButton *)widget())->isMenuButton());
- return true;
-}
+
//
bool KviKvsObject_button::functionIsOn(KviKvsObjectFunctionCall *c)
{
- if (widget()) c->returnValue()->setBoolean(((QPushButton *)widget())->isOn());
+ if (widget()) c->returnValue()->setBoolean(((QPushButton *)widget())->isChecked());
return true;
}
bool KviKvsObject_button::functionToggle(KviKvsObjectFunctionCall *c)
@@ -136,7 +118,7 @@ bool KviKvsObject_button::functionToggle(KviKvsObjectFunctionCall *c)
if(widget()) ((QPushButton *)widget())->toggle();
return true;
}
-// FIX ME
+
bool KviKvsObject_button::functionSetImage(KviKvsObjectFunctionCall *c)
{
QString icon;
@@ -145,8 +127,8 @@ bool KviKvsObject_button::functionSetImage(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_END(c)
if (!widget()) return true;
QPixmap * pix = g_pIconManager->getImage(icon);
- if(pix) ((QPushButton *)widget())->setIconSet(*pix);
- else((QPushButton *)widget())->setIcon(QIconSet());
+ if(pix) ((QPushButton *)widget())->setIcon(*pix);
+ else((QPushButton *)widget())->setIcon(QIcon());
return true;
}
bool KviKvsObject_button::functionclickEvent(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_button.h b/src/modules/objects/class_button.h
index 48233759e..5b1c92e4c 100644
--- a/src/modules/objects/class_button.h
+++ b/src/modules/objects/class_button.h
@@ -45,8 +45,6 @@ protected:
bool functionSetOn(KviKvsObjectFunctionCall *c);
bool functionIsOn(KviKvsObjectFunctionCall *c);
bool functionToggle(KviKvsObjectFunctionCall *c);
- bool functionSetIsMenuButton(KviKvsObjectFunctionCall *c);
- bool functionIsMenuButton(KviKvsObjectFunctionCall *c);
bool functionSetImage(KviKvsObjectFunctionCall *c);
bool functionclickEvent(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 3ec6fedb0..9d2d408b2 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -73,7 +73,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_buttongroup)
bool KviKvsObject_buttongroup::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
QButtonGroup *group=new QButtonGroup(parentScriptWidget());
- group->setObjectName(name());
+ group->setObjectName(getName());
setObject(group,true);
return true;
}
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index c9dc9dc0e..50a6f996d 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -77,7 +77,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox)
bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- KviStyledCheckBox * cb = new KviStyledCheckBox(parentScriptWidget(), name());
+ KviStyledCheckBox * cb = new KviStyledCheckBox(parentScriptWidget(), getName());
setObject(cb, true);
connect(cb,SIGNAL(toggled(bool)),this,SLOT(toggled(bool)));
connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked()));
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp
index 1df1d9c9f..8b96fd386 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/class_combobox.cpp
@@ -134,6 +134,7 @@ bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLi
{
SET_OBJECT(QComboBox);
connect (((QComboBox *)widget()),SIGNAL(activated( int )),this,SLOT(slotActivated( int )));
+ connect (((QComboBox *)widget()),SIGNAL(editTextChanged(const QString & )),this,SLOT(editTextChanged(const QString & )));
return true;
}
@@ -147,9 +148,9 @@ bool KviKvsObject_combobox::functioninsertItem(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_END(c)
if(widget())
if(c->paramCount()==1)
- ((QComboBox *)widget())->insertItem(szItem);
+ ((QComboBox *)widget())->addItem(szItem);
else
- ((QComboBox *)widget())->insertItem(szItem, iIndex);
+ ((QComboBox *)widget())->insertItem( iIndex,szItem);
return true;
}
bool KviKvsObject_combobox::functionclear(KviKvsObjectFunctionCall *c)
@@ -175,7 +176,7 @@ bool KviKvsObject_combobox::functionchangeItem(KviKvsObjectFunctionCall *c)
uIndex = cnt - 1;
}
- ((QComboBox *)widget())->changeItem(szText, uIndex);
+ ((QComboBox *)widget())->setItemText( uIndex,szText);
return true;
@@ -224,12 +225,12 @@ bool KviKvsObject_combobox::functioncount(KviKvsObjectFunctionCall *c)
}
bool KviKvsObject_combobox::functioncurrent(KviKvsObjectFunctionCall *c)
{
- if (widget()) c->returnValue()->setString(((QComboBox *)widget())->currentText().toLocal8Bit().data());
+ if (widget()) c->returnValue()->setString(((QComboBox *)widget())->currentText());
return true;
}
bool KviKvsObject_combobox::functioncurrentItem(KviKvsObjectFunctionCall *c)
{
- if (widget()) c->returnValue()->setInteger(((QComboBox *)widget())->currentItem());
+ if (widget()) c->returnValue()->setInteger(((QComboBox *)widget())->currentIndex());
return true;
}
bool KviKvsObject_combobox::functiontextLineEdit(KviKvsObjectFunctionCall *c)
@@ -247,9 +248,6 @@ bool KviKvsObject_combobox::functionsetEditable(KviKvsObjectFunctionCall *c)
if(widget())
{
((QComboBox *)widget())->setEditable(bFlag);
- if (bFlag) connect (((QComboBox *)widget())->lineEdit(),SIGNAL(textChanged(const QString & )),this,SLOT(slottextChanged(const QString & )));
- else
- disconnect (((QComboBox *)widget())->lineEdit(),SIGNAL(textChanged(const QString & )),this,SLOT(slottextChanged(const QString & )));
}
return true;
@@ -268,7 +266,7 @@ bool KviKvsObject_combobox::functionsetTextLineEdit(KviKvsObjectFunctionCall *c)
bool KviKvsObject_combobox::functioneditable(KviKvsObjectFunctionCall *c)
{
if(widget())
- c->returnValue()->setBoolean(((QComboBox *)widget())->editable());
+ c->returnValue()->setBoolean(((QComboBox *)widget())->isEditable());
return true;
}
bool KviKvsObject_combobox::functionsetEditText(KviKvsObjectFunctionCall *c)
@@ -292,7 +290,7 @@ bool KviKvsObject_combobox::functiontextAt(KviKvsObjectFunctionCall *c)
KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
KVSO_PARAMETERS_END(c)
if(widget())
- c->returnValue()->setString(((QComboBox *)widget())->text(uIndex));
+ c->returnValue()->setString(((QComboBox *)widget())->itemText(uIndex));
return true;
}
bool KviKvsObject_combobox::functionsetCurrentItem(KviKvsObjectFunctionCall *c)
@@ -302,13 +300,13 @@ bool KviKvsObject_combobox::functionsetCurrentItem(KviKvsObjectFunctionCall *c)
KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
KVSO_PARAMETERS_END(c)
if(widget())
- ((QComboBox *)widget())->setCurrentItem(uIndex);
+ ((QComboBox *)widget())->setCurrentIndex(uIndex);
return true;
}
bool KviKvsObject_combobox::functionpopup(KviKvsObjectFunctionCall *c)
{
if(widget())
- ((QComboBox *)widget())->popup();
+ ((QComboBox *)widget())->showPopup();
return true;
}
bool KviKvsObject_combobox::functionsetInsertionPolicy(KviKvsObjectFunctionCall *c)
@@ -319,17 +317,17 @@ bool KviKvsObject_combobox::functionsetInsertionPolicy(KviKvsObjectFunctionCall
KVSO_PARAMETERS_END(c)
if(!widget()) return true;
if(KviQString::equalCI(szPolicy,"NoInsertion"))
- ((QComboBox *)widget())->setInsertionPolicy(QComboBox::NoInsertion);
+ ((QComboBox *)widget())->setInsertPolicy(QComboBox::NoInsertion);
else if(KviQString::equalCI(szPolicy,"AtTop"))
- ((QComboBox *)widget())->setInsertionPolicy(QComboBox::AtTop);
+ ((QComboBox *)widget())->setInsertPolicy(QComboBox::AtTop);
else if(KviQString::equalCI(szPolicy,"AtBotton"))
- ((QComboBox *)widget())->setInsertionPolicy(QComboBox::AtBottom);
+ ((QComboBox *)widget())->setInsertPolicy(QComboBox::AtBottom);
else if(KviQString::equalCI(szPolicy,"AtCurrent"))
- ((QComboBox *)widget())->setInsertionPolicy(QComboBox::AtCurrent);
+ ((QComboBox *)widget())->setInsertPolicy(QComboBox::AtCurrent);
else if(KviQString::equalCI(szPolicy,"AfterCurrent"))
- ((QComboBox *)widget())->setInsertionPolicy(QComboBox::AfterCurrent);
+ ((QComboBox *)widget())->setInsertPolicy(QComboBox::AfterCurrent);
else if(KviQString::equalCI(szPolicy,"BeforeCurrent"))
- ((QComboBox *)widget())->setInsertionPolicy(QComboBox::BeforeCurrent);
+ ((QComboBox *)widget())->setInsertPolicy(QComboBox::BeforeCurrent);
else c->warning(__tr2qs("Invalid insertion Policy %Q"),&szPolicy);
return true;
}
@@ -344,7 +342,7 @@ bool KviKvsObject_combobox::functiontextChangedEvent(KviKvsObjectFunctionCall *c
}
-void KviKvsObject_combobox::slottextChanged(const QString &text)
+void KviKvsObject_combobox::editTextChanged(const QString &text)
{
KviKvsVariantList params(new KviKvsVariant(text));
callFunction(this,"textChangedEvent",¶ms);
diff --git a/src/modules/objects/class_combobox.h b/src/modules/objects/class_combobox.h
index 58d2b1a27..085a418ea 100644
--- a/src/modules/objects/class_combobox.h
+++ b/src/modules/objects/class_combobox.h
@@ -64,7 +64,7 @@ protected:
bool functiontextChangedEvent(KviKvsObjectFunctionCall *c);
bool functionactivatedEvent(KviKvsObjectFunctionCall *c);
protected slots:
- void slottextChanged(const QString &);
+ void editTextChanged(const QString &);
void slotActivated(int);
};
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index 88b4c0877..a49392c4d 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -68,7 +68,8 @@ bool KviKvsObject_dialog::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
{
QWidget * w = g_pApp->activeModalWidget();
if(!w)w = g_pFrame;
- QDialog * d = new QDialog(parentScriptWidget() ? parentScriptWidget() : w,name());
+ QDialog * d = new QDialog(parentScriptWidget() ? parentScriptWidget() : w);
+ d->setObjectName(getName());
//d->setModal(true);
setObject(d);
return true;
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index b7fd22c19..d28f7d939 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -195,12 +195,12 @@ bool KviKvsObject_file::functionsetName(KviKvsObjectFunctionCall *c)
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("file_name",KVS_PT_STRING,0,szName)
KVSO_PARAMETERS_END(c)
- if (m_pFile) m_pFile->setName(szName);
+ if (m_pFile) m_pFile->setFileName(szName);
return true;
}
bool KviKvsObject_file::functionname(KviKvsObjectFunctionCall *c)
{
- if (m_pFile) c->returnValue()->setString(m_pFile->name());
+ if (m_pFile) c->returnValue()->setString(m_pFile->fileName());
return true;
}
@@ -211,7 +211,7 @@ bool KviKvsObject_file::functionopen(KviKvsObjectFunctionCall *c)
KVSO_PARAMETER("file_mode",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,modes)
KVSO_PARAMETERS_END(c)
if (!m_pFile) return true;
- if(m_pFile->name().isEmpty())
+ if(m_pFile->fileName().isEmpty())
{
c->warning(__tr2qs("Empty filename string"));
return true;
@@ -268,7 +268,7 @@ bool KviKvsObject_file::functionsize(KviKvsObjectFunctionCall *c)
}
bool KviKvsObject_file::functionatEnd(KviKvsObjectFunctionCall *c)
{
- if (m_pFile) c->returnValue()->setInteger((kvs_int_t)(m_pFile->size()));
+ if (m_pFile) c->returnValue()->setInteger((kvs_int_t)(m_pFile->atEnd()));
return true;
}
@@ -276,7 +276,7 @@ bool KviKvsObject_file::functionatEnd(KviKvsObjectFunctionCall *c)
bool KviKvsObject_file::functionwhere(KviKvsObjectFunctionCall *c)
{
if (!m_pFile->isOpen()) c->warning(__tr2qs("File is not open!"));
- else c->returnValue()->setInteger((kvs_int_t)(m_pFile->at()));
+ else c->returnValue()->setInteger((kvs_int_t)(m_pFile->pos()));
return true;
}
bool KviKvsObject_file::functionseek(KviKvsObjectFunctionCall *c)
@@ -288,7 +288,7 @@ bool KviKvsObject_file::functionseek(KviKvsObjectFunctionCall *c)
if (!m_pFile) return true;
if(!m_pFile->isOpen())
c->warning(__tr("File is not open !"));
- else m_pFile->at(uIndex);
+ else m_pFile->seek(uIndex);
return true;
}
@@ -302,7 +302,8 @@ bool KviKvsObject_file::functionputch(KviKvsObjectFunctionCall *c)
{
if (szChar.length()>1)c->warning(__tr2qs("Argument to long, using only first char"));
const char *ch=szChar;
- if (m_pFile->putch(ch[0])<0) c->warning(__tr2qs("Write error occured !"));
+
+ if (!m_pFile->putChar(ch[0])) c->warning(__tr2qs("Write error occured !"));
}
return true;
@@ -314,9 +315,9 @@ bool KviKvsObject_file::functiongetch(KviKvsObjectFunctionCall *c)
c->warning(__tr("File is not open !"));
else
{
- int chInt=m_pFile->getch();
- if (chInt<0) c->warning(__tr("Read error occured !")); // c->error ?
- QString szChar = QChar(chInt);
+ char ch;
+ if (!m_pFile->getChar(&ch)) c->warning(__tr("Read error occured !")); // c->error ?
+ QString szChar = QChar(ch);
c->returnValue()->setString(szChar);
}
return true;
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index f6974ccd6..4ba10d9f4 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -185,8 +185,8 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox)
bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- KviTalGroupBox *groupbox=new KviTalGroupBox(name(),parentScriptWidget());
- groupbox->setObjectName(name());
+ KviTalGroupBox *groupbox=new KviTalGroupBox(getName(),parentScriptWidget());
+ groupbox->setObjectName(getName());
setObject(groupbox,true);
return true;
}
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index a2c72b9dd..4cedf7234 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -46,25 +46,18 @@ const char * const align_tbl[] = {
"Bottom",
"WordBreak"
};
- #define QT_LABEL_ALIGNLEFT Qt::AlignLeft
- #define QT_LABEL_ALIGNRIGHT Qt::AlignRight
- #define QT_LABEL_ALIGNHCENTER Qt::AlignHCenter
- #define QT_LABEL_ALIGNVCENTER Qt::AlignVCenter
- #define QT_LABEL_ALIGNCENTER Qt::AlignCenter
- #define QT_LABEL_ALIGNTOP Qt::AlignTop
- #define QT_LABEL_ALIGNBOTTOM Qt::AlignBottom
- #define QT_LABEL_JUSTIFY Qt::AlignJustify
+
const int align_cod[] = {
- QT_LABEL_ALIGNLEFT,
- QT_LABEL_ALIGNRIGHT,
- QT_LABEL_ALIGNHCENTER,
- QT_LABEL_ALIGNVCENTER,
- QT_LABEL_ALIGNCENTER,
- QT_LABEL_ALIGNTOP,
- QT_LABEL_ALIGNBOTTOM,
- QT_LABEL_JUSTIFY,
+ Qt::AlignLeft,
+ Qt::AlignRight,
+ Qt::AlignHCenter,
+ Qt::AlignVCenter,
+ Qt::AlignCenter,
+ Qt::AlignTop,
+ Qt::AlignBottom,
+ Qt::AlignJustify,
};
#define align_num (sizeof(align_tbl) / sizeof(align_tbl[0]))
@@ -126,15 +119,6 @@ const int frame_cod[] = {
!fn: $setMargin()
Sets margin width / height to .
See also [classfnc]$margin[/classfnc]().
- !fn: $autoResize()
- Returns 1, if auto-resize ability of the label is enabled.
- See also [classfnc]$setAutoResize[/classfnc]().
- !fn: $setAutoResize()
- Sets auto-resize ability to enabled (if is 1) or disabled
- (if is 0). If auto-resize is enabled, the label will
- automagically resize itself accordingly to the 'size' of the
- text it contains.
- See also [classfnc]$autoResize[/classfnc]().
!fn: $alignment()
Returns a string containing alignment flags that are set for
this label. The flags are separated by commas. An example output
@@ -205,8 +189,8 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_label,"label","widget")
KVSO_REGISTER_HANDLER(KviKvsObject_label,"text", functionText)
KVSO_REGISTER_HANDLER(KviKvsObject_label,"margin", functionMargin)
KVSO_REGISTER_HANDLER(KviKvsObject_label,"setMargin", functionSetMargin)
- KVSO_REGISTER_HANDLER(KviKvsObject_label,"autoResize", functionAutoResize)
- KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAutoResize", functionSetAutoResize)
+// KVSO_REGISTER_HANDLER(KviKvsObject_label,"autoResize", functionAutoResize)
+// KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAutoResize", functionSetAutoResize)
KVSO_REGISTER_HANDLER(KviKvsObject_label,"alignment", functionAlignment)
KVSO_REGISTER_HANDLER(KviKvsObject_label,"setAlignment", functionSetAlignment)
KVSO_REGISTER_HANDLER(KviKvsObject_label,"clear", functionClear)
@@ -260,7 +244,7 @@ bool KviKvsObject_label::functionMargin(KviKvsObjectFunctionCall *c)
if (widget()) c->returnValue()->setInteger(((QLabel *)widget())->margin());
return true;
}
-
+/*
// FIX ME
bool KviKvsObject_label::functionSetAutoResize(KviKvsObjectFunctionCall *c)
{
@@ -278,7 +262,8 @@ bool KviKvsObject_label::functionAutoResize(KviKvsObjectFunctionCall *c)
if (widget()) c->returnValue()->setBoolean(true);
return true;
}
-//
+*/
+
bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
{
QStringList alignment;
@@ -305,7 +290,7 @@ bool KviKvsObject_label::functionSetAlignment(KviKvsObjectFunctionCall *c)
c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it));
}
- ((QLabel *)widget())->setAlignment(sum);
+ ((QLabel *)widget())->setAlignment((Qt::Alignment)sum);
return true;
}
bool KviKvsObject_label::functionAlignment(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_label.h b/src/modules/objects/class_label.h
index ca98412f3..a195c9d0a 100644
--- a/src/modules/objects/class_label.h
+++ b/src/modules/objects/class_label.h
@@ -41,8 +41,6 @@ protected:
bool functionText(KviKvsObjectFunctionCall *c);
bool functionMargin(KviKvsObjectFunctionCall *c);
bool functionSetMargin(KviKvsObjectFunctionCall *c);
- bool functionAutoResize(KviKvsObjectFunctionCall *c);
- bool functionSetAutoResize(KviKvsObjectFunctionCall *c);
bool functionAlignment(KviKvsObjectFunctionCall *c);
bool functionSetAlignment(KviKvsObjectFunctionCall *c);
bool functionClear(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 19cc525d9..719a3213d 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -112,7 +112,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
return false;
}
setObject(new QGridLayout(w));
- setObjectName(name());
+ setObjectName(getName());
return true;
}
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index d87e3f79c..155f31bbc 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -263,7 +263,7 @@ bool KviKvsObject_lineedit::functionSetMaxLength(KviKvsObjectFunctionCall *c)
bool KviKvsObject_lineedit::functionFrame(KviKvsObjectFunctionCall *c)
{
if(widget())
- c->returnValue()->setBoolean(((QLineEdit *)widget())->frame());
+ c->returnValue()->setBoolean(((QLineEdit *)widget())->hasFrame());
return true;
}
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index c7275afba..093e87a7d 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -28,6 +28,7 @@
#include "class_list.h"
#include "class_listbox.h"
+#include
/*
@doc: listbox
@keyterms:
@@ -71,7 +72,7 @@
not specified the item is appended.
!fn: $changeItem(, )
Changes text of item at to .
- !fn: $removeItem()
+ !fn: $removeItem()
Removes item at given index.
!fn: $count()
Returns number of items in the widget.
@@ -110,7 +111,7 @@
KVSO_BEGIN_REGISTERCLASS(KviKvsObject_listbox,"listbox","widget")
- KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"insertItem", functioninsertItem)
+/* KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"insertItem", functioninsertItem)
KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"changeItem", functionchangeItem)
KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"removeItem", functionremoveItem)
KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"clear", functionclear)
@@ -127,6 +128,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_listbox,"listbox","widget")
KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"selectionMode",functionselectionMode);
KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"setSelected",functionsetSelected);
KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"isSelected",functionisSelected);
+ */
KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"currentItemChangeEvent",functioncurrentItemChangeEvent);
KVSO_REGISTER_HANDLER(KviKvsObject_listbox,"onItemEvent",functiononItemEvent);
@@ -147,73 +149,77 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listbox)
bool KviKvsObject_listbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- KviTalListBox * b = new KviTalListBox(parentScriptWidget());
- b->setSelectionMode(KviTalListBox::Single);
- connect(b,SIGNAL(selectionChanged()),this,SLOT(selectionChanged()));
- connect(b,SIGNAL(currentChanged(KviTalListBoxItem *)),this,SLOT(currentItemChanged(KviTalListBoxItem *)));
-
- connect(b,SIGNAL(onItem(KviTalListBoxItem *)),this,SLOT(onItem(KviTalListBoxItem *)));
-
- setObject(b,true);;
+ //KviTalListBox * b = new KviTalListBox(parentScriptWidget());
+ SET_OBJECT(QListWidget)
+ obj->setSelectionMode(QAbstractItemView::SingleSelection);
+ connect(obj,SIGNAL(itemSelectionChanged()),this,SLOT(selectionChanged()));
+ connect(obj,SIGNAL(currentItemChanged(QListWidgetItem *)),this,SLOT(currentItemChanged(QListWidgetItem *)));
+// connect(obj,SIGNAL(onItem(QListWidgetItem *)),this,SLOT(onItem(QListWidgetItem *)));
return true;
}
bool KviKvsObject_listbox::functioninsertItem(KviKvsObjectFunctionCall *c)
{
- kvs_int_t iIndex;
- QString szItem;
+ if(!widget()) return true;
+ kvs_int_t iRow;
+ QString szText;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("text",KVS_PT_STRING,0,szItem)
- KVSO_PARAMETER("index",KVS_PT_INT,KVS_PF_OPTIONAL,iIndex)
+ KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
+ KVSO_PARAMETER("index",KVS_PT_INT,KVS_PF_OPTIONAL,iRow)
KVSO_PARAMETERS_END(c)
- if(widget())
- ((KviTalListBox *)widget())->insertItem(szItem, iIndex);
+ if (c->parameterCount()==2) ((QListWidget *)widget())->insertItem(iRow, szText);
+ else ((QListWidget *)widget())->addItem(szText);
return true;
}
+
bool KviKvsObject_listbox::functionclear(KviKvsObjectFunctionCall *c)
{
- if (widget()) ((KviTalListBox *)widget())->clear();
+ if (widget()) ((QListWidget *)widget())->clear();
return true;
}
+
bool KviKvsObject_listbox::functionchangeItem(KviKvsObjectFunctionCall *c)
{
- kvs_uint_t uIndex,cnt;
+ kvs_int_t iIndex,cnt;
QString szText;
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
- KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
+ KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)
KVSO_PARAMETERS_END(c)
if(!widget()) return true;
if (szText.isEmpty()) c->warning(__tr2qs("No string parameter given - using empty string"));
- if(uIndex >= (cnt = ((KviTalListBox *)widget())->count()))
+ if(iIndex >= (cnt = ((KviTalListBox *)widget())->count()))
{
c->warning(__tr2qs("Item index [%d] is too big - defaulting to " \
- "$count() - 1 [%d]"), uIndex, cnt);
- uIndex = cnt - 1;
+ "$count() - 1 [%d]"), iIndex, cnt);
+ iIndex = cnt - 1;
}
- ((KviTalListBox *)widget())->changeItem(szText, uIndex);
+ //((QListWidget *)widget())->removeItem(iIndex);
+ ((QListWidget *)widget())->item(iIndex)->setText(szText);
return true;
}
+
+
bool KviKvsObject_listbox::functionremoveItem(KviKvsObjectFunctionCall *c)
{
- kvs_uint_t uIndex,cnt;
+ kvs_uint_t iIndex,cnt;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
+ KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)
KVSO_PARAMETERS_END(c)
if(!widget()) return true;
- if(uIndex >= (cnt = ((KviTalListBox *)widget())->count()))
+ if(iIndex >= (cnt = ((KviTalListBox *)widget())->count()))
{
c->warning(__tr2qs("Item index [%d] is too big - defaulting to " \
- "$count() - 1 [%d]"), uIndex, cnt);
- uIndex = cnt - 1;
+ "$count() - 1 [%d]"), iIndex, cnt);
+ iIndex = cnt - 1;
}
- ((KviTalListBox *)widget())->removeItem(uIndex);
+ delete ((QListWidget *)widget())->takeItem(iIndex);
return true;
@@ -221,39 +227,39 @@ bool KviKvsObject_listbox::functionremoveItem(KviKvsObjectFunctionCall *c)
bool KviKvsObject_listbox::functioncount(KviKvsObjectFunctionCall *c)
{
- if (widget()) c->returnValue()->setInteger(((KviTalListBox *)widget())->count());
+ if (widget()) c->returnValue()->setInteger(((QListWidget *)widget())->count());
return true;
}
bool KviKvsObject_listbox::functioncurrentText(KviKvsObjectFunctionCall *c)
{
- if (widget()) c->returnValue()->setString(((KviTalListBox *)widget())->currentText().toLocal8Bit().data());
+ if (widget()) c->returnValue()->setString(((QListWidget *)widget())->currentItem()->text().toLocal8Bit().data());
return true;
}
bool KviKvsObject_listbox::functioncurrentItem(KviKvsObjectFunctionCall *c)
{
- if (widget()) c->returnValue()->setInteger(((KviTalListBox *)widget())->currentItem());
+ if (widget()) c->returnValue()->setInteger(((QListWidget *)widget())->currentRow());
return true;
}
bool KviKvsObject_listbox::functiontextAt(KviKvsObjectFunctionCall *c)
{
- kvs_uint_t uIndex;
+ kvs_uint_t iIndex;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
+ KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)
KVSO_PARAMETERS_END(c)
if(widget())
- c->returnValue()->setString(((KviTalListBox *)widget())->text(uIndex));
+ c->returnValue()->setString(((QListWidget *)widget())->item(iIndex)->text());
return true;
}
bool KviKvsObject_listbox::functionsetCurrentItem(KviKvsObjectFunctionCall *c)
{
- kvs_uint_t uIndex;
+ kvs_uint_t iIndex;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
+ KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)
KVSO_PARAMETERS_END(c)
if(widget())
- ((KviTalListBox *)widget())->setCurrentItem(uIndex);
+ ((QListWidget *)widget())->setCurrentRow(iIndex);
return true;
}
bool KviKvsObject_listbox::functionsetSelectionMode(KviKvsObjectFunctionCall *c)
@@ -263,18 +269,18 @@ bool KviKvsObject_listbox::functionsetSelectionMode(KviKvsObjectFunctionCall *c)
KVSO_PARAMETER("selection_mode",KVS_PT_STRING,0,szMode)
KVSO_PARAMETERS_END(c)
if(!widget()) return true;
- KviTalListBox::SelectionMode iMode = KviTalListBox::Single;
+ QAbstractItemView::SelectionMode iMode = QAbstractItemView::SingleSelection;
- if(KviQString::equalCI(szMode,"single")) iMode = KviTalListBox::Single;
+ if(KviQString::equalCI(szMode,"single")) iMode = QAbstractItemView::SingleSelection;
- else if(KviQString::equalCI(szMode,"multi")) iMode = KviTalListBox::Multi;
+ else if(KviQString::equalCI(szMode,"multi")) iMode = QAbstractItemView::MultiSelection;
- else if(KviQString::equalCI(szMode,"extended")) iMode = KviTalListBox::Extended;
+ else if(KviQString::equalCI(szMode,"extended")) iMode = QAbstractItemView::ExtendedSelection;
- else if(KviQString::equalCI(szMode,"none")) iMode = KviTalListBox::NoSelection;
+ else if(KviQString::equalCI(szMode,"none")) iMode = QAbstractItemView::NoSelection;
else c->warning(__tr2qs("Invalid selection mode '%Q' assuming single"),&szMode);
- ((KviTalListBox *)widget())->setSelectionMode(iMode);
+ ((QListWidget *)widget())->setSelectionMode(iMode);
return true;
}
@@ -282,38 +288,40 @@ bool KviKvsObject_listbox::functionselectionMode(KviKvsObjectFunctionCall *c)
{
if(!widget()) return true;
- switch(((KviTalListBox *)widget())->selectionMode())
+ switch(((QListWidget *)widget())->selectionMode())
{
- case KviTalListBox::Single: c->returnValue()->setString("single"); break;
- case KviTalListBox::Multi: c->returnValue()->setString("multi"); break;
- case KviTalListBox::Extended: c->returnValue()->setString("extended"); break;
- case KviTalListBox::NoSelection: c->returnValue()->setString("none"); break;
+ case QAbstractItemView::SingleSelection: c->returnValue()->setString("single"); break;
+ case QAbstractItemView::MultiSelection: c->returnValue()->setString("multi"); break;
+ case QAbstractItemView::ExtendedSelection: c->returnValue()->setString("extended"); break;
+ case QAbstractItemView::NoSelection: c->returnValue()->setString("none"); break;
default: c->returnValue()->setString("single"); break;
}
return true;
}
-
+/*
bool KviKvsObject_listbox::functionisSelected(KviKvsObjectFunctionCall *c)
{
- kvs_uint_t uIndex;
+ kvs_uint_t iIndex;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
+ KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)
KVSO_PARAMETERS_END(c)
- if(widget())c->returnValue()->setBoolean(((KviTalListBox *)widget())->isSelected(uIndex));
+ if(widget())c->returnValue()->setBoolean(((QListWidget *)widget())->isSelected(iIndex));
return true;
}
+
bool KviKvsObject_listbox::functionsetSelected(KviKvsObjectFunctionCall *c)
{
bool bSel;
- kvs_uint_t uIndex;
+ kvs_uint_t iIndex;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
+ KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex)
KVSO_PARAMETER("benabled",KVS_PT_BOOLEAN,0,bSel)
KVSO_PARAMETERS_END(c)
- if(widget()) ((KviTalListBox *)widget())->setSelected(uIndex,bSel);
+ if(widget()) ((QListWidget *)widget())->setSelected(iIndex,bSel);
return true;
}
+*/
bool KviKvsObject_listbox::functionitemAt(KviKvsObjectFunctionCall *c)
{
kvs_uint_t uX,uY;
@@ -322,7 +330,7 @@ bool KviKvsObject_listbox::functionitemAt(KviKvsObjectFunctionCall *c)
KVSO_PARAMETER("uY",KVS_PT_UNSIGNEDINTEGER,0,uY)
KVSO_PARAMETERS_END(c)
if(widget())
- c->returnValue()->setInteger(((KviTalListBox *)widget())->index(((KviTalListBox *)widget())->itemAt(QPoint(uX,uY))));
+ c->returnValue()->setInteger(((QListWidget *)widget())->row(((QListWidget *)widget())->itemAt(QPoint(uX,uY))));
return true;
}
@@ -339,7 +347,7 @@ void KviKvsObject_listbox::selectionChanged()
callFunction(this,"selectionChangeEvent",0,0);
}
-void KviKvsObject_listbox::currentItemChanged(KviTalListBoxItem *item)
+void KviKvsObject_listbox::currentItemChanged(QListWidgetItem *item)
{
if (!item) callFunction(this,"currentItemChangeEvent",0,0);
else
@@ -356,23 +364,24 @@ bool KviKvsObject_listbox::functiononItemEvent(KviKvsObjectFunctionCall *c)
return true;
}
-void KviKvsObject_listbox::onItem(KviTalListBoxItem *item)
+void KviKvsObject_listbox::onItem(QListWidgetItem *item)
{
- KviTalListBox *lbx = (KviTalListBox *)(item->listBox());
+ /*QListWidget *lbx = (QListWidget *)(item->listBox());
KviKvsVariantList params(new KviKvsVariant((kvs_int_t)lbx->index(item)));
callFunction(this,"onItemEvent",0,¶ms);
+ */
}
-
+/*
bool KviKvsObject_listbox::functionitemRect(KviKvsObjectFunctionCall *c)
{
-kvs_uint_t uIndex;
+kvs_uint_t iIndex;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("uIndex",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
+ KVSO_PARAMETER("iIndex",KVS_PT_UNSIGNEDINTEGER,0,iIndex)
KVSO_PARAMETERS_END(c)
if(widget())
{
- QRect rect=((KviTalListBox *)widget())->itemRect(((KviTalListBox *)widget())->item(uIndex));
+ QRect rect=((KviTalListBox *)widget())->itemRect(((KviTalListBox *)widget())->item(iIndex));
KviKvsArray * a = new KviKvsArray();
a->set(0,new KviKvsVariant((kvs_int_t)rect.left()));
a->set(1,new KviKvsVariant((kvs_int_t)rect.top()));
@@ -383,7 +392,7 @@ kvs_uint_t uIndex;
return true;
}
-
+*/
#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
#include "m_class_listbox.moc"
#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_listbox.h b/src/modules/objects/class_listbox.h
index c7927b0ea..13c432cfb 100644
--- a/src/modules/objects/class_listbox.h
+++ b/src/modules/objects/class_listbox.h
@@ -25,9 +25,10 @@
#include "class_widget.h"
+#include
-class KviTalListBox;
-class KviTalListBoxItem;
+//class KviTalListBox;
+//class KviTalListBoxItem;
#include "object_macros.h"
@@ -53,17 +54,18 @@ protected:
bool functionclear(KviKvsObjectFunctionCall *c);
bool functionsetSelectionMode(KviKvsObjectFunctionCall *c);
bool functionselectionMode(KviKvsObjectFunctionCall *c);
- bool functionsetSelected(KviKvsObjectFunctionCall *c);
+ /*bool functionsetSelected(KviKvsObjectFunctionCall *c);
bool functionisSelected(KviKvsObjectFunctionCall *c);
+ */
bool functioncurrentItemChangeEvent(KviKvsObjectFunctionCall *c);
bool functiononItemEvent(KviKvsObjectFunctionCall *c);
bool functionitemAt(KviKvsObjectFunctionCall *c);
- bool functionitemRect(KviKvsObjectFunctionCall *c);
+ //bool functionitemRect(KviKvsObjectFunctionCall *c);
protected slots:
void selectionChanged();
- void currentItemChanged(KviTalListBoxItem *);
- void onItem(KviTalListBoxItem *);
+ void currentItemChanged(QListWidgetItem *);
+ void onItem(QListWidgetItem *);
};
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 8e7d42172..35cbd7e6e 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -215,7 +215,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview)
bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- setObject(new KviKvsMdmListView(parentScriptWidget(),name(),this),true);
+ setObject(new KviKvsMdmListView(parentScriptWidget(),getName(),this),true);
connect(widget(),SIGNAL(clicked(KviTalListViewItem *)),this,SLOT(slotClicked(KviTalListViewItem *)));
connect(widget(),SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(slotSelectionChanged(KviTalListViewItem *)));
connect(widget(),SIGNAL(selectionChanged()),this,SLOT(slotMultipleSelectionChanged()));
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 073558ef8..870fef715 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -67,7 +67,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow)
bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- setObject(new KviTalMainWindow(parentScriptWidget(), name()), true);
+ setObject(new KviTalMainWindow(parentScriptWidget(), getName()), true);
return true;
}
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index f9b077f32..067da4822 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -186,7 +186,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu)
bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- setObject(new KviTalPopupMenu(parentScriptWidget(), name()), true);
+ setObject(new KviTalPopupMenu(parentScriptWidget(), getName()), true);
connect(widget(),SIGNAL(activated(int)),this,SLOT(slotactivated(int)));
connect(widget(),SIGNAL(highlighted(int)),this,SLOT(slothighlighted(int)));
return true;
diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp
index f0363657e..ee43e8dbe 100644
--- a/src/modules/objects/class_progressbar.cpp
+++ b/src/modules/objects/class_progressbar.cpp
@@ -91,7 +91,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_progressbar)
bool KviKvsObject_progressbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
Q3ProgressBar *pbar=new Q3ProgressBar(parentScriptWidget());
- pbar->setObjectName(name());
+ pbar->setObjectName(getName());
setObject(pbar,true);
return true;
}
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp
index 83a1c751b..9a962e968 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/class_radiobutton.cpp
@@ -82,7 +82,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton)
bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- setObject(new QRadioButton(parentScriptWidget(),name()),true);
+ SET_OBJECT(QRadioButton)
connect(widget(),SIGNAL(toggled(bool)),this,SLOT(toggled(bool)));
return true;
}
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 1fe08acf2..317cb5c12 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -216,7 +216,7 @@ bool KviKvsObject_tabwidget::functionaddTab(KviKvsObjectFunctionCall *c)
QPixmap * pix = g_pIconManager->getImage(szIcon);
if(pix){
- ((QTabWidget *)widget())->addTab(((QWidget *)(ob->object())),QIconSet(*pix),szLabel);
+ ((QTabWidget *)widget())->addTab(((QWidget *)(ob->object())),QIcon(*pix),szLabel);
}
else((QTabWidget *)widget())->addTab(((QWidget *)(ob->object())),szLabel);
return true;
@@ -253,7 +253,7 @@ bool KviKvsObject_tabwidget::functioninsertTab(KviKvsObjectFunctionCall *c)
}
QPixmap * pix = g_pIconManager->getImage(szIcon);
if(pix){
- ((QTabWidget *)widget())->insertTab( ((QWidget *)(ob->object())),QIconSet(*pix),szLabel,uIndex);
+ ((QTabWidget *)widget())->insertTab( ((QWidget *)(ob->object())),QIcon(*pix),szLabel,uIndex);
}
else ((QTabWidget *)widget())->insertTab(((QWidget *)(ob->object())),szLabel,uIndex);
return true;
@@ -491,7 +491,7 @@ bool KviKvsObject_tabwidget::functionchangeTab(KviKvsObjectFunctionCall *c)
}
QPixmap * pix = g_pIconManager->getImage(szIcon);
if(pix){
- ((QTabWidget *)widget())->changeTab(((QWidget *)(ob->object())),QIconSet(*pix),szLabel);
+ ((QTabWidget *)widget())->changeTab(((QWidget *)(ob->object())),QIcon(*pix),szLabel);
}
else ((QTabWidget *)widget())->changeTab(((QWidget *)(ob->object())),szLabel);
return true;
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index 33288882f..0f909522f 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -86,7 +86,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
}
if(parentObject()->inherits("KviKvsObject_mainwindow"))
{
- setObject(new KviTalToolBar(name(), ((KviTalMainWindow *)parentScriptWidget())), true);
+ setObject(new KviTalToolBar(getName(), ((KviTalMainWindow *)parentScriptWidget())), true);
}
else
{
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 760ea0872..176b13ba4 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -143,10 +143,10 @@ bool KviKvsObject_toolbutton::functionsetImage(KviKvsObjectFunctionCall *c)
if (!widget()) return true;
QPixmap * pix = g_pIconManager->getImage(icon);
if(pix){
- ((QToolButton *)widget())->setIconSet(QIconSet(*pix));
+ ((QToolButton *)widget())->setIconSet(QIcon(*pix));
}
else
- ((QToolButton *)widget())->setIconSet(QIconSet());
+ ((QToolButton *)widget())->setIconSet(QIcon());
return true;
}
bool KviKvsObject_toolbutton::functionsetUsesBigPixmap(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 7a3f584d4..81222f086 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -112,7 +112,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_window)
bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),name());
+ KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),getName());
setObject(w);
pContext->window()->frame()->addWindow(w,false);
w->minimize(); // must be minimized before children are added, otherwise the focus handling goes nuts...
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index a0c04de6d..03b0b7d8c 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -124,7 +124,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_wizard)
bool KviKvsObject_wizard::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
{
- setObject(new KviKvsMdmWizard(parentScriptWidget(), name(),this), true);
+ setObject(new KviKvsMdmWizard(parentScriptWidget(), getName(),this), true);
return true;
}
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index d45dac910..bede2f59d 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -184,11 +184,11 @@ QWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const QString szClass, c
bool bNameMatch = false;
bool bClassMatch = false;
if( !szName.isEmpty() )
- bNameMatch = KviQString::equalCI(list.at(idx)->name(), szName);
+ bNameMatch = KviQString::equalCI(list.at(idx)->objectName(), szName);
else
bNameMatch = true;
if( !szClass.isEmpty())
- bClassMatch = KviQString::equalCI(list.at(idx)->className(), szClass);
+ bClassMatch = KviQString::equalCI(list.at(idx)->metaObject()->className(), szClass);
else
bClassMatch = true;
if( bNameMatch && bClassMatch ) {
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 29fe60724..b108a0a85 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -827,13 +827,13 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
{
cmd->window()->output(80, "Ptr %u: top level object: %c%s%c, class %s, %s, rect = %d, %d, %d, %d",
list.at(i),
- KVI_TEXT_BOLD, list.at(i)->name(), KVI_TEXT_BOLD,
- list.at(i)->className(),
+ KVI_TEXT_BOLD, list.at(i)->objectName(), KVI_TEXT_BOLD,
+ list.at(i)->metaObject()->className(),
list.at(i)->isVisible() ? "visible" : "hidden",
list.at(i)->x(), list.at(i)->y(), list.at(i)->width(), list.at(i)->height());
}
- QString szClass=list.at(i)->className();
- QString szObj=list.at(i)->name();
+ QString szClass=list.at(i)->metaObject()->className();
+ QString szObj=list.at(i)->objectName();
QString szTemp;
szTemp = szClass + "::" + szObj;
KviKvsVariant v;
@@ -868,11 +868,11 @@ static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spaci
{
pWnd->output(80, "%sPtr %u: object: %c%s%c, class %s",
spacing, list.at(i), KVI_TEXT_BOLD,
- list.at(i)->name(), KVI_TEXT_BOLD, list.at(i)->className()
+ list.at(i)->objectName(), KVI_TEXT_BOLD, list.at(i)->metaObject()->className()
);
}
- QString szClass=list.at(i)->className();
- QString szObj=list.at(i)->name();
+ QString szClass=list.at(i)->metaObject()->className();
+ QString szObj=list.at(i)->objectName();
QString szTemp;
szTemp=spacing+szClass+"::"+szObj;
KviKvsVariant v;
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h
index 020398ebf..ab0feab3d 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -38,7 +38,7 @@
#define SET_OBJECT(__className) \
__className *obj=new __className(parentScriptWidget()); \
- obj->setObjectName(name()); \
+ obj->setObjectName(getName()); \
setObject(obj,true);
#define KVSO_REGISTER_HANDLER(__className,__szName,__proc) \
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index acae9f89b..42f8378a9 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -232,7 +232,10 @@ bool KviSoundPlayer::playPhonon(const QString &szFileName)
#ifdef COMPILE_ON_WINDOWS
bool KviSoundPlayer::playWinmm(const QString &szFileName)
{
- if(isMuted()) return true;
+ sndPlaySound(szFileName.toLocal8Bit().data(),SND_ASYNC | SND_NODEFAULT);
+ return true;
+ // This does not compile on win!
+ /*if(isMuted()) return true;
KviArtsSoundThread * t = new KviArtsSoundThread(szFileName);
if(!t->start())
{
@@ -240,6 +243,7 @@ bool KviSoundPlayer::playPhonon(const QString &szFileName)
return false;
}
return true;
+ */
}
#else //!COMPILE_ON_WINDOWS
#ifdef COMPILE_OSS_SUPPORT
@@ -355,7 +359,7 @@ void KviSoundThread::run()
}
-#ifndef COMPILE_ON_WINDOWS
+#ifdef COMPILE_ON_WINDOWS
#ifdef COMPILE_OSS_SUPPORT
#ifdef COMPILE_AUDIOFILE_SUPPORT
KviOssAudiofileSoundThread::KviOssAudiofileSoundThread(const QString &szFileName)
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index 9b36d9d27..dd7a69ff3 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -40,7 +40,7 @@
#include
#include
#include
-#include
+#include
#include
typedef struct _KviUrl
--
cgit v1.3.1-10-gc9f91