diff options
| author |  Noldor | 2007-01-16 22:01:45 +0000 |
|---|---|---|
| committer | Noldor | 2007-01-16 22:01:45 +0000 |
| commit | 9651fae9ef800029739f19b360dd7bf59edfbde3 (patch) | |
| tree | 6017149f9c2fd17253ed54fdcc3855292005590f /src/modules/theme | |
| parent | A discussion about the numbering scheme in hackers.guide.txt (diff) | |
| download | KVIrc-9651fae9ef800029739f19b360dd7bf59edfbde3.tar.gz KVIrc-9651fae9ef800029739f19b360dd7bf59edfbde3.tar.bz2 KVIrc-9651fae9ef800029739f19b360dd7bf59edfbde3.zip | |
fixed compilation error on win, update project, fixed themedialog , listbox....
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@177 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/theme')
| -rw-r--r-- | src/modules/theme/managementdialog.cpp | 34 | ||||
| -rw-r--r-- | src/modules/theme/theme_vc05.vcproj | 63 |
2 files changed, 67 insertions, 30 deletions
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index c066da522..9c252e769 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -69,7 +69,6 @@ #include "kvi_packagefile.h" #include "kvi_fileextensions.h" #include "kvi_filedialog.h" -#include "kvi_dynamictooltip.h" #include <stdlib.h> // rand & srand @@ -117,7 +116,7 @@ KviThemeListBoxItem::~KviThemeListBoxItem() delete m_pText; } -void KviThemeListBoxItem::paint(QPainter * p) +void KviThemeListBoxItem::paint ( QPainter * p ) { QListBoxText::paint(p); p->drawPixmap(LVI_BORDER,LVI_BORDER, *(g_pIconManager->getBigIcon(QString(KVI_BIGICON_THEME))) ); @@ -127,7 +126,7 @@ void KviThemeListBoxItem::paint(QPainter * p) m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,p->window().height() - (LVI_BORDER * 2)),listBox()->viewport()->colorGroup()); } -int KviThemeListBoxItem::height(const QListBox * lb) const +int KviThemeListBoxItem::height ( const QListBox * lb ) const { int iHeight = m_pText->height() + (2 * LVI_BORDER); if(iHeight < (LVI_ICON_SIZE + (2 * LVI_BORDER)))iHeight = LVI_ICON_SIZE + (2 * LVI_BORDER); @@ -206,8 +205,6 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent) connect(m_pListBox,SIGNAL(selectionChanged()),this,SLOT(enableDisableButtons())); g->addMultiCellWidget(m_pListBox,1,1,0,1); - KviDynamicToolTip * tip = new KviDynamicToolTip(m_pListBox); - connect(tip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); QPushButton * b = new QPushButton(__tr2qs("Close"),this); connect(b,SIGNAL(clicked()),this,SLOT(closeClicked())); @@ -241,34 +238,11 @@ void KviThemeManagementDialog::closeClicked() m_pInstance = 0; } -void KviThemeManagementDialog::tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt) -{ - KviThemeListBoxItem * it = (KviThemeListBoxItem *)(m_pListBox->itemAt(pnt)); - if(!it)return; - KviThemeInfo * pThemeInfo = it->themeInfo(); - - QString szThemeDescription; - KviThemeFunctions::getThemeHtmlDescription( - szThemeDescription, - pThemeInfo->name(), - pThemeInfo->version(), - pThemeInfo->description(), - pThemeInfo->subdirectory(), - pThemeInfo->application(), - pThemeInfo->author(), - pThemeInfo->date(), - pThemeInfo->themeEngineVersion(), - pThemeInfo->mediumScreenshot(), - 0 - ); - - pTip->tip(m_pListBox->itemRect(it),szThemeDescription); -} void KviThemeManagementDialog::display() { - if(m_pInstance)return; - m_pInstance = new KviThemeManagementDialog(g_pFrame); + if(!m_pInstance) + m_pInstance = new KviThemeManagementDialog(g_pFrame); m_pInstance->show(); } diff --git a/src/modules/theme/theme_vc05.vcproj b/src/modules/theme/theme_vc05.vcproj index 0d275d635..d4733bc7c 100644 --- a/src/modules/theme/theme_vc05.vcproj +++ b/src/modules/theme/theme_vc05.vcproj @@ -221,6 +221,30 @@ RelativePath=".\moc_managementdialog.cpp"
>
</File>
+ <File
+ RelativePath=".\moc_packthemedialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\moc_savethemedialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\moc_themefunctions.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\packthemedialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\savethemedialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\themefunctions.cpp"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -249,6 +273,45 @@ />
</FileConfiguration>
</File>
+ <File
+ RelativePath=".\packthemedialog.h"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\moc_$(InputName).cpp" "$(InputDir)\$(InputFileName)""
+ Outputs="$(InputDir)\moc_$(InputName).cpp"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\savethemedialog.h"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\moc_$(InputName).cpp" "$(InputDir)\$(InputFileName)""
+ Outputs="$(InputDir)\moc_$(InputName).cpp"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\themefunctions.h"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\moc_$(InputName).cpp" "$(InputDir)\$(InputFileName)""
+ Outputs="$(InputDir)\moc_$(InputName).cpp"
+ />
+ </FileConfiguration>
+ </File>
</Filter>
<Filter
Name="Resource Files"
|