diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/theme/managementdialog.cpp | 11 | ||||
| -rw-r--r-- | src/modules/theme/managementdialog.h | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 4e92298c5..e9a816367 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -52,7 +52,6 @@ #include "kvi_tal_listbox.h" #include "kvi_tal_popupmenu.h" #include <kvi_tal_textedit.h> -#include <kvi_tal_textedit.h> #include <QLayout> #include <QPushButton> @@ -103,11 +102,13 @@ KviThemeListBoxItem::KviThemeListBoxItem(KviTalListBox * box,KviThemeInfo * inf) t += "<br><nobr><font size=\"-1\">"; t += inf->description(); t += "</font></nobr>"; - m_pText = new KviTalSimpleRichText(t,box->font()); + m_pText = new KviTalTextEdit(); + m_pText->setFont(box->font()); + m_pText->setText(t); int iWidth = box->visibleWidth(); if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH; iWidth -= LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER; - m_pText->setWidth(iWidth); + m_pText->setLineWidth(iWidth); } KviThemeListBoxItem::~KviThemeListBoxItem() @@ -122,8 +123,8 @@ void KviThemeListBoxItem::paint(QPainter * p) p->drawPixmap(LVI_BORDER,LVI_BORDER, *(g_pIconManager->getBigIcon(QString(KVI_BIGICON_THEME))) ); int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING; int www = p->window().width() - (afterIcon + LVI_BORDER); - m_pText->setWidth(www); - m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,p->window().height() - (LVI_BORDER * 2)),listBox()->viewport()->colorGroup()); + m_pText->setLineWidth(www); + //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 KviTalListBox * lb) const diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h index 8aee0ce29..1e852d9de 100644 --- a/src/modules/theme/managementdialog.h +++ b/src/modules/theme/managementdialog.h @@ -29,15 +29,12 @@ #include "kvi_theme.h" #include "kvi_tal_listbox.h" #include "kvi_tal_popupmenu.h" -#include <kvi_tal_wizard.h> +#include "kvi_tal_wizard.h" #include <QDialog> #include <QComboBox> #include <QCursor> -#include <q3simplerichtext.h> -#define KviTalSimpleRichText Q3SimpleRichText - class QLineEdit; class QPushButton; class QLabel; @@ -54,8 +51,8 @@ public: KviThemeListBoxItem(KviTalListBox * box,KviThemeInfo * inf); virtual ~KviThemeListBoxItem(); public: - KviThemeInfo * m_pThemeInfo; - KviTalSimpleRichText * m_pText; + KviThemeInfo * m_pThemeInfo; + KviTalTextEdit * m_pText; public: KviThemeInfo * themeInfo(){ return m_pThemeInfo; }; virtual int height ( const KviTalListBox * lb ) const ; @@ -72,8 +69,8 @@ public: virtual ~KviThemeManagementDialog(); protected: static KviThemeManagementDialog * m_pInstance; - KviTalListBox * m_pListBox; - KviTalPopupMenu * m_pContextPopup; + KviTalListBox * m_pListBox; + KviTalPopupMenu * m_pContextPopup; KviStyledToolButton * m_pDeleteThemeButton; KviStyledToolButton * m_pPackThemeButton; public: |