diff options
| author |  Noldor | 2010-08-09 11:03:57 +0000 |
|---|---|---|
| committer | Noldor | 2010-08-09 11:03:57 +0000 |
| commit | b0de5b274b57f729a4408b26a0f336730ad4d87c (patch) | |
| tree | 717f38591f51596b5947a61fa985786f3d208ef2 /src/modules | |
| parent | Fix in classeditor member function dialog (diff) | |
| download | KVIrc-b0de5b274b57f729a4408b26a0f336730ad4d87c.tar.gz KVIrc-b0de5b274b57f729a4408b26a0f336730ad4d87c.tar.bz2 KVIrc-b0de5b274b57f729a4408b26a0f336730ad4d87c.zip | |
More work on #882(wip)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4825 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/classeditor/classeditor.cpp | 18 | ||||
| -rw-r--r-- | src/modules/classeditor/classeditor.h | 3 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp index 22fd54cd6..d8e7a029a 100644 --- a/src/modules/classeditor/classeditor.cpp +++ b/src/modules/classeditor/classeditor.cpp @@ -180,7 +180,6 @@ KviClassEditor::KviClassEditor(QWidget * par) hbox->setSpacing(0); hbox->setMargin(0); - m_pInheritsClassNameLabel=new QLabel(__tr2qs_ctx("No item selected","editor"),hbox); hbox = new KviTalHBox(box); hbox->setSpacing(0); @@ -725,7 +724,7 @@ void KviClassEditor::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *) m_pClassNameLabel->setText(szLabelText); m_pClassNameRenameButton->setEnabled(true); m_pFunctionNameRenameButton->setEnabled(false); - m_pInheritsClassNameLabel->setText(""); + //m_pInheritsClassNameLabel->setText(""); m_pFunctionNameLabel->setText(""); m_pEditor->setText(""); m_pEditor->setEnabled(false); @@ -735,14 +734,14 @@ void KviClassEditor::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *) QString szLabelText = __tr2qs_ctx("Class","editor"); szLabelText += ": <b>"; szLabelText += szClassName; - szLabelText += "</b>"; - m_pClassNameLabel->setText(szLabelText); - - szLabelText = __tr2qs_ctx("Inherits Class","editor"); + szLabelText += "</b>, "; + szLabelText += __tr2qs_ctx("Inherits from class ","editor"); szLabelText += ": <b>"; szLabelText += pClassItem->InheritsClass(); szLabelText += "</b>"; - m_pInheritsClassNameLabel->setText(szLabelText); + m_pClassNameLabel->setText(szLabelText); + + //m_pInheritsClassNameLabel->setText(szLabelText); szLabelText = __tr2qs_ctx("Member Function:","editor"); if(m_pLastEditedItem->isMethod()) @@ -790,8 +789,9 @@ void KviClassEditor::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *) szFunctionsList.sort(); for(int i=0;i<szFunctionsList.count();i++) { - szBuffer+="Member Function: <b>$"+szFunctionsList.at(i)+"</b><br>"; - szBuffer+="Parameters reminder: "+lFunctions.find(szFunctionsList.at(i))->reminder()+"<br><br>"; + szBuffer+="Member Function: <b>$"+szFunctionsList.at(i)+"</b><br>"; + if(!lFunctions.find(szFunctionsList.at(i))->reminder().isEmpty()) + szBuffer+="Parameters reminder: "+lFunctions.find(szFunctionsList.at(i))->reminder()+"<br><br>"; } m_pEditor->setUnHighlightedText(szBuffer); m_pEditor->setReadOnly(true); diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/classeditor.h index ddd2cf5ab..2b5c838ba 100644 --- a/src/modules/classeditor/classeditor.h +++ b/src/modules/classeditor/classeditor.h @@ -110,8 +110,7 @@ public: KviScriptEditor * m_pEditor; KviClassEditorTreeWidget * m_pTreeWidget; QLabel * m_pClassNameLabel; - QLabel * m_pInheritsClassNameLabel; - QPushButton * m_pClassNameRenameButton; + QPushButton * m_pClassNameRenameButton; QLabel * m_pFunctionNameLabel; QPushButton * m_pFunctionNameRenameButton; QLabel * m_pReminderLabel; |