aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/theme
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/theme')
-rw-r--r--src/modules/theme/libkvitheme.cpp10
-rw-r--r--src/modules/theme/managementdialog.cpp25
-rw-r--r--src/modules/theme/managementdialog.h1
-rw-r--r--src/modules/theme/packthemedialog.cpp38
-rw-r--r--src/modules/theme/savethemedialog.cpp28
5 files changed, 50 insertions, 52 deletions
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 570ed8b00..ef8e4cd9a 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -60,8 +60,8 @@ QRect g_rectManagementDialogGeometry(0,0,0,0);
static bool theme_kvs_cmd_install(KviKvsModuleCommandCall * c)
{
- QString szThemePackFile;
-
+ QString szThemePackFile;
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("package_path",KVS_PT_STRING,0,szThemePackFile)
KVSM_PARAMETERS_END(c)
@@ -94,8 +94,8 @@ static bool theme_kvs_cmd_install(KviKvsModuleCommandCall * c)
static bool theme_kvs_cmd_screenshot(KviKvsModuleCommandCall * c)
{
- QString szFileName;
-
+ QString szFileName;
+
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("file_name_path",KVS_PT_STRING,KVS_PF_OPTIONAL,szFileName)
KVSM_PARAMETERS_END(c)
@@ -115,7 +115,7 @@ static bool theme_kvs_cmd_screenshot(KviKvsModuleCommandCall * c)
if(szFileName.isEmpty())return true; // done
KviFileUtils::adjustFilePath(szFileName);
- if(QFileInfo(szFileName).extension(false)!="png")
+ if(QFileInfo(szFileName).suffix()!="png")
szFileName+=".png";
QString szError;
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 8616cabbb..8d86e06fe 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -42,7 +42,6 @@
#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_listwidget.h"
@@ -76,13 +75,13 @@ KviThemeListWidgetItem::KviThemeListWidgetItem(KviTalListWidget * box,KviThemeIn
t = "<nobr><b>";
t += inf->name();
t += "</b>";
-
+
if(!inf->version().isEmpty()) {
t += "[";
t += inf->version();
t += "]";
}
-
+
if(!inf->author().isEmpty()) {
t += " <font color=\"#a0a0a0\"> ";
t += __tr2qs_ctx("by","theme");
@@ -113,7 +112,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
m_pItemDelegate=0;
setObjectName("theme_options_widget");
setWindowTitle(__tr2qs_ctx("Manage Themes - KVIrc","theme"));
- setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEME)));
+ setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEME)));
setModal(true);
@@ -132,24 +131,24 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
tb = new QToolButton(hb);
tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE)));
tb->setIconSize(QSize(32,32));
- QToolTip::add(tb,__tr2qs_ctx("Save Current Theme...","theme"));
+ tb->setToolTip(__tr2qs_ctx("Save Current Theme...","theme"));
connect(tb,SIGNAL(clicked()),this,SLOT(saveCurrentTheme()));
sep = new QFrame(hb);
sep->setFrameStyle(QFrame::VLine | QFrame::Sunken);
sep->setMinimumWidth(12);
-
+
m_pPackThemeButton = new QToolButton(hb);
m_pPackThemeButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK)));
m_pPackThemeButton->setIconSize(QSize(32,32));
- QToolTip::add(m_pPackThemeButton,__tr2qs_ctx("Export Selected Themes to a Distributable Package","theme"));
+ m_pPackThemeButton->setToolTip(__tr2qs_ctx("Export Selected Themes to a Distributable Package","theme"));
connect(m_pPackThemeButton,SIGNAL(clicked()),this,SLOT(packTheme()));
m_pDeleteThemeButton = new QToolButton(hb);
m_pDeleteThemeButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE)));
m_pDeleteThemeButton->setIconSize(QSize(32,32));
- QToolTip::add(m_pDeleteThemeButton,__tr2qs_ctx("Delete Selected Themes","theme"));
+ m_pDeleteThemeButton->setToolTip(__tr2qs_ctx("Delete Selected Themes","theme"));
connect(m_pDeleteThemeButton,SIGNAL(clicked()),this,SLOT(deleteTheme()));
sep = new QFrame(hb);
@@ -159,13 +158,13 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
tb = new QToolButton(hb);
tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN)));
tb->setIconSize(QSize(32,32));
- QToolTip::add(tb,__tr2qs_ctx("Install Theme Package From Disk","theme"));
+ tb->setToolTip(__tr2qs_ctx("Install Theme Package From Disk","theme"));
connect(tb,SIGNAL(clicked()),this,SLOT(installFromFile()));
tb = new QToolButton(hb);
tb->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_WWW)));
tb->setIconSize(QSize(32,32));
- QToolTip::add(tb,__tr2qs_ctx("Get More Themes...","theme"));
+ tb->setToolTip(__tr2qs_ctx("Get More Themes...","theme"));
connect(tb,SIGNAL(clicked()),this,SLOT(getMoreThemes()));
QWidget *w= new QWidget(hb);
@@ -182,7 +181,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
m_pListWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
m_pListWidget->setSortingEnabled(true);
connect(m_pListWidget,SIGNAL(itemActivated(QListWidgetItem *)),this,SLOT(applyTheme(QListWidgetItem *)));
-
+
//FIXME tooltip
//connect(m_pListWidget,SIGNAL(tipRequest(QListWidgetItem *,const QPoint &)),this,SLOT(tipRequest(QListWidgetItem *,const QPoint &)));
connect(m_pListWidget,SIGNAL(customContextMenuRequested(const QPoint &)),
@@ -318,7 +317,7 @@ void KviThemeManagementDialog::installFromFile()
int iThemeCount=0;
QString szFileName;
QString szError;
-
+
if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs_ctx("Open Theme - KVIrc","theme"),QString::null,KVI_FILTER_THEME))
return;
if(!KviThemeFunctions::installThemePackage(szFileName,szError,this))
@@ -387,7 +386,7 @@ bool KviThemeManagementDialog::hasSelectedItems()
{
QList<QListWidgetItem*> itemsSelected = m_pListWidget->selectedItems ();
return itemsSelected.count()?true:false;
-
+
}
void KviThemeManagementDialog::enableDisableButtons()
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 674a66cd2..cb1494bc5 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -27,7 +27,6 @@
#include "kvi_optionswidget.h"
#include "kvi_pointerlist.h"
#include "kvi_theme.h"
-#include "kvi_tal_listbox.h"
#include "kvi_tal_popupmenu.h"
#include "kvi_tal_wizard.h"
#include "kvi_tal_listwidget.h"
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 05162c7d4..5c152821f 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -68,7 +68,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
QString szPackageDescription;
QString szPackageVersion;
- m_szPackagePath = QDir::homeDirPath();
+ m_szPackagePath = QDir::homePath();
KviQString::ensureLastCharIs(m_szPackagePath,QChar(KVI_PATH_SEPARATOR_CHAR));
bool bPackagePathSet = false;
@@ -89,14 +89,14 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
szPackageVersion = pThemeInfo->version();
m_szPackagePath += pThemeInfo->subdirectory();
- if(m_szPackagePath.find(QRegExp("[0-9]\\.[0-9]")) == -1)
+ if(m_szPackagePath.indexOf(QRegExp("[0-9]\\.[0-9]")) == -1)
{
m_szPackagePath += "-";
m_szPackagePath += szPackageVersion;
}
m_szPackagePath += ".";
m_szPackagePath += KVI_FILEEXTENSION_THEMEPACKAGE;
-
+
bPackagePathSet = true;
}
}
@@ -116,7 +116,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
// welcome page ==================================================================================
QWidget * pPage = new QWidget(this);
QGridLayout * pLayout = new QGridLayout(pPage);
-
+
QLabel * pLabel = new QLabel(pPage);
QString szText = "<p>";
szText += __tr2qs_ctx("This procedure allows you to export the selected themes to a single package. It is useful when you want to distribute your themes to the public.","theme");
@@ -130,7 +130,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
pLabel->setText(szText);
pLayout->addWidget(pLabel,0,0);
pLayout->setRowStretch(1,1);
-
+
addPage(pPage,__tr2qs_ctx("Welcome","theme"));
setBackEnabled(pPage,false);
setNextEnabled(pPage,true);
@@ -157,14 +157,14 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
for(pThemeInfo = m_pThemeInfoList->first();pThemeInfo;pThemeInfo = m_pThemeInfoList->next())
{
QString szThemeDescription;
-
+
if(pixScreenshot.isNull())
{
pixScreenshot = pThemeInfo->smallScreenshot();
if(!pixScreenshot.isNull())
szScreenshotPath = pThemeInfo->smallScreenshotPath();
}
-
+
KviThemeFunctions::getThemeHtmlDescription(
szThemeDescription,
pThemeInfo->name(),
@@ -184,7 +184,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
szThemesDescription += szThemeDescription;
iIdx++;
}
-
+
szThemesDescription += "</body></html>";
KviTalTextEdit * pTextEdit = new KviTalTextEdit(pPage);
@@ -213,13 +213,13 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
pLabel->setWordWrap(true);
pLabel->setText(__tr2qs_ctx("Here you need to provide informations about you (the packager) and a short description of the package you're creating.","theme"));
pLabel->setTextFormat(Qt::RichText);
- pLayout->addMultiCellWidget(pLabel,0,0,0,1);
-
+ pLayout->addWidget(pLabel,0,0,1,2);
+
pLabel = new QLabel(pPage);
pLabel->setWordWrap(true);
pLabel->setText(__tr2qs_ctx("Package Name:","theme"));
pLayout->addWidget(pLabel,1,0);
-
+
m_pPackageNameEdit = new QLineEdit(pPage);
m_pPackageNameEdit->setText(szPackageName);
pLayout->addWidget(m_pPackageNameEdit,1,1);
@@ -228,7 +228,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
pLabel->setWordWrap(true);
pLabel->setText(__tr2qs_ctx("Version:","theme"));
pLayout->addWidget(pLabel,2,0);
-
+
m_pPackageVersionEdit = new QLineEdit(pPage);
m_pPackageVersionEdit->setText(szPackageVersion);
pLayout->addWidget(m_pPackageVersionEdit,2,1);
@@ -236,7 +236,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
pLabel = new QLabel(pPage);
pLabel->setText(__tr2qs_ctx("Description:","theme"));
pLayout->addWidget(pLabel,3,0);
-
+
m_pPackageDescriptionEdit = new KviTalTextEdit(pPage);
m_pPackageDescriptionEdit->setText(szPackageDescription);
pLayout->addWidget(m_pPackageDescriptionEdit,3,1);
@@ -244,7 +244,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
pLabel = new QLabel(pPage);
pLabel->setText(__tr2qs_ctx("Package Author:","theme"));
pLayout->addWidget(pLabel,4,0);
-
+
m_pPackagerNameEdit = new QLineEdit(pPage);
m_pPackagerNameEdit->setText(szPackageAuthor);
pLayout->addWidget(m_pPackagerNameEdit,4,1);
@@ -268,7 +268,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
pLabel->setText(__tr2qs_ctx("Here you can choose the image that will appear in the installation dialog for your theme package. It can be an icon, a logo or a screenshot and it should be not larger than 300x225. If you don't provide an image a simple default icon will be used at installation stage.","theme"));
pLabel->setTextFormat(Qt::RichText);
pLayout->addWidget(pLabel,0,0);
-
+
m_pImageLabel = new QLabel(pPage);
m_pImageLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
m_pImageLabel->setMinimumSize(300,225);
@@ -363,7 +363,7 @@ bool KviPackThemeDialog::packTheme()
QString szPackageAuthor = m_pPackagerNameEdit->text();
QString szPackageName = m_pPackageNameEdit->text();
- QString szPackageDescription = m_pPackageDescriptionEdit->text();
+ QString szPackageDescription = m_pPackageDescriptionEdit->toPlainText();
QString szPackageVersion = m_pPackageVersionEdit->text();
QImage pix(m_szImagePath);
@@ -401,7 +401,7 @@ bool KviPackThemeDialog::packTheme()
{
QByteArray * pba = new QByteArray();
QBuffer buffer(pba,0);
- buffer.open(IO_WriteOnly);
+ buffer.open(QIODevice::WriteOnly);
out.save(&buffer,"PNG");
buffer.close();
f.addInfoField("Image",pba); // cool :) [no disk access needed]
@@ -436,7 +436,7 @@ bool KviPackThemeDialog::packTheme()
QByteArray * pba = new QByteArray();
QBuffer bufferz(pba,0);
- bufferz.open(IO_WriteOnly);
+ bufferz.open(QIODevice::WriteOnly);
pixScreenshot.save(&bufferz,"PNG");
bufferz.close();
f.addInfoField(szTmp,pba);
@@ -463,7 +463,7 @@ bool KviPackThemeDialog::packTheme()
QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
return false;
}
-
+
//KviPackageReader r;
//r.unpack("/root/test.kvt","/root/unpacked_test_kvt");
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index 262d0d64c..c7088e040 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -67,7 +67,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
// welcome page ==================================================================================
QWidget * pPage = new QWidget(this);
QGridLayout * pLayout = new QGridLayout(pPage);
-
+
QLabel * pLabel = new QLabel(pPage);
pLabel->setWordWrap(true);
QString szText = "<p>";
@@ -77,11 +77,11 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
szText += "</p><p>";
szText += __tr2qs_ctx("Hit the \"Next\" button to begin.","theme");
szText += "<p>";
-
+
pLabel->setText(szText);
pLayout->addWidget(pLabel,0,0);
pLayout->setRowStretch(1,1);
-
+
addPage(pPage,__tr2qs_ctx("Welcome","theme"));
setBackEnabled(pPage,false);
setNextEnabled(pPage,true);
@@ -97,12 +97,12 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
pLabel->setText(__tr2qs_ctx("Here you need to provide informations about you (the author) and a short description of the theme you're creating.","theme"));
pLabel->setWordWrap(true);
pLabel->setTextFormat(Qt::RichText);
- pLayout->addMultiCellWidget(pLabel,0,0,0,1);
-
+ pLayout->addWidget(pLabel,0,0,1,2);
+
pLabel = new QLabel(pPage);
pLabel->setText(__tr2qs_ctx("Theme Name:","theme"));
pLayout->addWidget(pLabel,1,0);
-
+
m_pThemeNameEdit = new QLineEdit(pPage);
//m_pThemeNameEdit->setText(szThemeName);
pLayout->addWidget(m_pThemeNameEdit,1,1);
@@ -110,7 +110,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
pLabel = new QLabel(pPage);
pLabel->setText(__tr2qs_ctx("Version:","theme"));
pLayout->addWidget(pLabel,2,0);
-
+
m_pThemeVersionEdit = new QLineEdit(pPage);
//m_pThemeVersionEdit->setText(szThemeVersion);
pLayout->addWidget(m_pThemeVersionEdit,2,1);
@@ -118,7 +118,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
pLabel = new QLabel(pPage);
pLabel->setText(__tr2qs_ctx("Description:","theme"));
pLayout->addWidget(pLabel,3,0);
-
+
m_pThemeDescriptionEdit = new KviTalTextEdit(pPage);
//m_pThemeDescriptionEdit->setText(szThemeDescription);
pLayout->addWidget(m_pThemeDescriptionEdit,3,1);
@@ -126,7 +126,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
pLabel = new QLabel(pPage);
pLabel->setText(__tr2qs_ctx("Theme Author:","theme"));
pLayout->addWidget(pLabel,4,0);
-
+
m_pAuthorNameEdit = new QLineEdit(pPage);
//m_pAuthorNameEdit->setText(szThemeAuthor);
pLayout->addWidget(m_pAuthorNameEdit,4,1);
@@ -151,7 +151,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
pLabel->setWordWrap(true);
pLabel->setTextFormat(Qt::RichText);
pLayout->addWidget(pLabel,0,0);
-
+
m_pImageLabel = new QLabel(pPage);
m_pImageLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
m_pImageLabel->setMinimumSize(300,225);
@@ -189,9 +189,9 @@ void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
{
QPixmap out;
if(pix.width() > 300 || pix.height() > 225)
- out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
+ out = QPixmap::fromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
else
- out.convertFromImage(pix);
+ out = QPixmap::fromImage(pix);
m_pImageLabel->setPixmap(out);
return;
}
@@ -237,7 +237,7 @@ bool KviSaveThemeDialog::saveTheme()
}
sto.setAuthor(m_pAuthorNameEdit->text());
- sto.setDescription(m_pThemeDescriptionEdit->text());
+ sto.setDescription(m_pThemeDescriptionEdit->toPlainText());
sto.setDate(QDateTime::currentDateTime().toString());
sto.setVersion(m_pThemeVersionEdit->text());
sto.setApplication("KVIrc " KVI_VERSION "." KVI_SOURCES_DATE);
@@ -269,7 +269,7 @@ bool KviSaveThemeDialog::saveTheme()
return false;
}
// write down the screenshot, if needed
-
+
if(!m_szScreenshotPath.isEmpty())
{
if(!KviTheme::saveScreenshots(sto,m_szScreenshotPath))
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 13:45:30 +0000