aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/theme
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/theme')
-rw-r--r--src/modules/theme/libkvitheme.cpp12
-rw-r--r--src/modules/theme/managementdialog.cpp52
-rw-r--r--src/modules/theme/managementdialog.h23
-rw-r--r--src/modules/theme/packthemedialog.cpp60
-rw-r--r--src/modules/theme/packthemedialog.h8
-rw-r--r--src/modules/theme/savethemedialog.cpp44
-rw-r--r--src/modules/theme/savethemedialog.h7
-rw-r--r--src/modules/theme/themefunctions.cpp9
-rw-r--r--src/modules/theme/themefunctions.h4
9 files changed, 83 insertions, 136 deletions
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 54f1359f6..e73d46be0 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -22,6 +22,9 @@
//
///////////////////////////////////////////////////////////////////////////////
+#include "managementdialog.h"
+#include "themefunctions.h"
+
#include "kvi_module.h"
#include "kvi_locale.h"
#include "kvi_qstring.h"
@@ -37,10 +40,7 @@
#include "kvi_fileutils.h"
#include "kvi_filedialog.h"
-#include "managementdialog.h"
-#include "themefunctions.h"
-
-#include <qfileinfo.h>
+#include <QFileInfo>
QRect g_rectManagementDialogGeometry(0,0,0,0);
@@ -182,8 +182,8 @@ static bool theme_module_can_unload(KviModule * m)
KVIRC_MODULE(
- "theme", // module name
- "1.0.0", // module version
+ "Theme", // module name
+ "4.0.0", // module version
"Copyright (C) 2006 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
"Theme management functions",
theme_module_init,
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index cef417909..43dbe7ee1 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -33,33 +33,6 @@
#include "savethemedialog.h"
#include "themefunctions.h"
-#include "kvi_iconmanager.h"
-#include "kvi_msgbox.h"
-
-
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include "kvi_tal_listbox.h"
-#include <qlineedit.h>
-#include <kvi_tal_textedit.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qfiledialog.h>
-#include "kvi_tal_popupmenu.h"
-#include <qcombobox.h>
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qimage.h>
-#include <kvi_tal_textedit.h>
-//#include <qmultilineedit.h>
-#ifdef COMPILE_USE_QT4
-#include <QCloseEvent>
-#endif
-#include <qbuffer.h>
-
#include "kvi_options.h"
#include "kvi_locale.h"
#include "kvi_config.h"
@@ -74,13 +47,35 @@
#include "kvi_fileextensions.h"
#include "kvi_filedialog.h"
#include "kvi_dynamictooltip.h"
+#include "kvi_iconmanager.h"
+#include "kvi_msgbox.h"
+#include "kvi_tal_listbox.h"
+#include "kvi_tal_popupmenu.h"
+#include <kvi_tal_textedit.h>
+#include <kvi_tal_textedit.h>
+
+#include <QLayout>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QRegExp>
+#include <QMessageBox>
+#include <QDir>
+#include <QStringList>
+#include <QDateTime>
+#include <QFileDialog>
+#include <QComboBox>
+#include <QPainter>
+#include <QToolTip>
+#include <QImage>
+#include <QBuffer>
+#include <QCloseEvent>
+//#include <q3multilineedit.h>
#include <stdlib.h> // rand & srand
extern QRect g_rectManagementDialogGeometry;
-
KviThemeListBoxItem::KviThemeListBoxItem(KviTalListBox * box,KviThemeInfo * inf)
: KviTalListBoxText(box)
{
@@ -245,7 +240,6 @@ void KviThemeManagementDialog::closeClicked()
m_pInstance = 0;
}
-
void KviThemeManagementDialog::display()
{
if(!m_pInstance)
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 9feb2117e..8aee0ce29 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -27,30 +27,23 @@
#include "kvi_optionswidget.h"
#include "kvi_pointerlist.h"
#include "kvi_theme.h"
-
-#include <qdialog.h>
-#ifdef COMPILE_USE_QT4
-#include <q3simplerichtext.h>
-#define KviTalSimpleRichText Q3SimpleRichText
-#else
-#include <qsimplerichtext.h>
-#define KviTalSimpleRichText QSimpleRichText
-#endif
#include "kvi_tal_listbox.h"
-#include <qcombobox.h>
#include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
#include <kvi_tal_wizard.h>
+#include <QDialog>
+#include <QComboBox>
+#include <QCursor>
+
+#include <q3simplerichtext.h>
+#define KviTalSimpleRichText Q3SimpleRichText
class QLineEdit;
-class KviTalTextEdit;
class QPushButton;
class QLabel;
class QCheckBox;
-
-//class QMultiLineEdit;
-
+//class Q3MultiLineEdit;
+class KviTalTextEdit;
class KviDynamicToolTip;
class KviStyledToolButton;
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 036c95434..ec34c13a3 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -25,28 +25,6 @@
#include "packthemedialog.h"
#include "themefunctions.h"
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qcombobox.h>
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qimage.h>
-#include <kvi_tal_textedit.h>
-#ifdef COMPILE_USE_QT4
-#include <q3multilineedit.h>
-#include <QDateTime>
-#else
-#include <qmultilineedit.h>
-#endif
-#include <qbuffer.h>
-#include <qlabel.h>
-#include <qregexp.h>
-
-
#include "kvi_options.h"
#include "kvi_locale.h"
#include "kvi_config.h"
@@ -62,7 +40,23 @@
#include "kvi_selectors.h"
#include "kvi_miscutils.h"
#include "kvi_sourcesdate.h"
+#include <kvi_tal_textedit.h>
+#include <QLayout>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QRegExp>
+#include <QMessageBox>
+#include <QDir>
+#include <QComboBox>
+#include <QPainter>
+#include <QToolTip>
+#include <QImage>
+#include <QDateTime>
+#include <QBuffer>
+#include <QLabel>
+
+#include <q3multilineedit.h>
KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviThemeInfo> * pThemeInfoList)
@@ -333,11 +327,7 @@ void KviPackThemeDialog::imageSelectionChanged(const QString &szImagePath)
{
QPixmap out;
if(pix.width() > 300 || pix.height() > 225)
-#ifdef COMPILE_USE_QT4
out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio,Qt::SmoothTransformation));
-#else
- out.convertFromImage(pix.smoothScale(300,225,QImage::ScaleMin));
-#endif
else
out.convertFromImage(pix);
m_pImageLabel->setPixmap(out);
@@ -351,14 +341,12 @@ void KviPackThemeDialog::imageSelectionChanged(const QString &szImagePath)
m_pImageLabel->setPixmap(QPixmap());
}
-
void KviPackThemeDialog::accept()
{
if(!packTheme())return;
KviTalWizard::accept();
}
-
bool KviPackThemeDialog::packTheme()
{
m_pImageSelector->commit();
@@ -374,11 +362,7 @@ bool KviPackThemeDialog::packTheme()
if(!pix.isNull())
{
if(pix.width() > 300 || pix.height() > 225)
- #ifdef COMPILE_USE_QT4
out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
- #else
- out.convertFromImage(pix.smoothScale(300,225,QImage::ScaleMin));
-#endif
else
out.convertFromImage(pix);
} else {
@@ -407,11 +391,7 @@ bool KviPackThemeDialog::packTheme()
if(!out.isNull())
{
QByteArray * pba = new QByteArray();
-#ifdef COMPILE_USE_QT4
- QBuffer buffer(pba,0);
-#else
- QBuffer buffer(*pba);
-#endif
+ QBuffer buffer(pba,0);
buffer.open(IO_WriteOnly);
out.save(&buffer,"PNG");
buffer.close();
@@ -445,11 +425,8 @@ bool KviPackThemeDialog::packTheme()
{
KviQString::sprintf(szTmp,"Theme%dScreenshot",iIdx);
QByteArray * pba = new QByteArray();
-#ifdef COMPILE_USE_QT4
+
QBuffer bufferz(pba,0);
-#else
- QBuffer bufferz(*pba);
-#endif
bufferz.open(IO_WriteOnly);
pixScreenshot.save(&bufferz,"PNG");
bufferz.close();
@@ -486,4 +463,3 @@ bool KviPackThemeDialog::packTheme()
return true;
}
-
diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h
index 9834006a2..e28b96c41 100644
--- a/src/modules/theme/packthemedialog.h
+++ b/src/modules/theme/packthemedialog.h
@@ -27,14 +27,14 @@
#include "kvi_settings.h"
#include "kvi_pointerlist.h"
#include "kvi_theme.h"
-
-#include <qdialog.h>
#include <kvi_tal_wizard.h>
+#include <QDialog>
+
class QLineEdit;
-class KviTalTextEdit;
class QLabel;
-class QMultiLineEdit;
+class Q3MultiLineEdit;
+class KviTalTextEdit;
class KviFileSelector;
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index a98780a7d..0732bd322 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -25,27 +25,6 @@
#include "savethemedialog.h"
#include "themefunctions.h"
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qcombobox.h>
-#include <qpainter.h>
-#include <qtooltip.h>
-#include <qimage.h>
-#include <kvi_tal_textedit.h>
-#ifdef COMPILE_USE_QT4
-#include <q3multilineedit.h>
-#include <QDateTime>
-#else
-#include <qmultilineedit.h>
-#endif
-#include <qbuffer.h>
-#include <qlabel.h>
-
-
#include "kvi_options.h"
#include "kvi_locale.h"
#include "kvi_config.h"
@@ -61,7 +40,23 @@
#include "kvi_selectors.h"
#include "kvi_miscutils.h"
#include "kvi_sourcesdate.h"
+#include <kvi_tal_textedit.h>
+#include <QLayout>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QRegExp>
+#include <QMessageBox>
+#include <QDir>
+#include <QComboBox>
+#include <QPainter>
+#include <QToolTip>
+#include <QImage>
+#include <QDateTime>
+#include <QBuffer>
+#include <QLabel>
+
+#include <q3multilineedit.h>
KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
@@ -192,11 +187,7 @@ void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
{
QPixmap out;
if(pix.width() > 300 || pix.height() > 225)
- #ifdef COMPILE_USE_QT4
out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
- #else
- out.convertFromImage(pix.smoothScale(300,225,QImage::ScaleMin));
-#endif
else
out.convertFromImage(pix);
m_pImageLabel->setPixmap(out);
@@ -210,14 +201,12 @@ void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
m_pImageLabel->setPixmap(QPixmap());
}
-
void KviSaveThemeDialog::accept()
{
if(!saveTheme())return;
KviTalWizard::accept();
}
-
void KviSaveThemeDialog::makeScreenshot()
{
QString szFileName;
@@ -298,4 +287,3 @@ bool KviSaveThemeDialog::saveTheme()
return true;
}
-
diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h
index 1ab9548ba..120c0f3ba 100644
--- a/src/modules/theme/savethemedialog.h
+++ b/src/modules/theme/savethemedialog.h
@@ -27,17 +27,16 @@
#include "kvi_settings.h"
#include "kvi_pointerlist.h"
#include "kvi_theme.h"
-
-#include <qdialog.h>
#include <kvi_tal_wizard.h>
+#include <QDialog>
class QLineEdit;
-class KviTalTextEdit;
class QPushButton;
class QCheckBox;
class QLabel;
-class QMultiLineEdit;
+class Q3MultiLineEdit;
+class KviTalTextEdit;
class KviFileSelector;
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index 2afa21f3a..f19fd8360 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -34,13 +34,10 @@
#include "kvi_sourcesdate.h"
#include "kvi_theme.h"
#include "kvi_frame.h"
-#ifdef COMPILE_USE_QT4
-#define KviTalMimeSourceFactory Q3MimeSourceFactory
-#include <q3mimefactory.h>
-#else
-#define KviTalMimeSourceFactory QMimeSourceFactory
-#endif
+
#include <qmime.h>
+#include <q3mimefactory.h>
+#define KviTalMimeSourceFactory Q3MimeSourceFactory
namespace KviThemeFunctions
{
diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/themefunctions.h
index d3b058865..e35e0c82d 100644
--- a/src/modules/theme/themefunctions.h
+++ b/src/modules/theme/themefunctions.h
@@ -27,8 +27,8 @@
#include "kvi_settings.h"
#include "kvi_qstring.h"
-#include <qwidget.h>
-#include <qpixmap.h>
+#include <QWidget>
+#include <QPixmap>
namespace KviThemeFunctions
{
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 10:35:48 +0000