diff --git a/debian/changelog b/debian/changelog index db798f5..bb0277d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +kylin-theme-builder (1.0.0.1-ok2.5) nile; urgency=medium + + * BUG: + #I9PUTX 【需求28549】【主要】【主题制作工坊】字体最大化后,“是否保存为历史记录”的弹窗显示不全,且“清楚”的按钮应该显示为不保存 + #I9Q251 【需求28549】【X】【不重要】【主题制作工坊】窗口透明度滑动条数值输入<30的数字,没有自动变更为30 + #IA68VB【主题制作工坊】【次要】【全局主题】创建窗口外观为深色的主题,安装应用后部分应用未变为深色 + #IA6D0B【主题制作工坊】【次要】【全局主题】设置控件圆角主题后,部分控件并未变为所设置的直角 + #IA6OA5【主题制作工坊】【次要】【图标主题】系统桌面界面有一个图标名称未汉化 + * 需求号:无 + * 其他改动说明:无 + * 其他改动说明影响域:无 + + -- 李柯 Tue, 18 Jun 2024 14:19:41 +0800 + kylin-theme-builder (1.0.0.1-ok2.4) nile; urgency=medium * BUG: diff --git a/src/build/build.cpp b/src/build/build.cpp index 64e5cda..2aa18ec 100644 --- a/src/build/build.cpp +++ b/src/build/build.cpp @@ -5,7 +5,7 @@ void build::run() //生成源码orig文件 QProcess process1; QString dir1 = QDir::homePath() + "/.cache/theme-build/"+FileProcess::g_date; - qDebug() << dir1; +// qDebug() << dir1; QString command1 = "tar"; QStringList arguments1; arguments1 << "-zcvf" << FileProcess::g_themeENName+"_1.0.orig.tar.xz" @@ -26,7 +26,7 @@ void build::run() //编译 QProcess process2; QString dir2 = QDir::homePath() + "/.cache/theme-build/" + FileProcess::g_date + "/src/"; - qDebug() << dir2; +// qDebug() << dir2; QString command2 = "debuild"; QStringList arguments2; arguments2 << "-us"<<"-uc"; diff --git a/src/build/buildWidget.cpp b/src/build/buildWidget.cpp index 668d453..0c736de 100644 --- a/src/build/buildWidget.cpp +++ b/src/build/buildWidget.cpp @@ -56,7 +56,7 @@ buildWidget::buildWidget(QWidget *parent): continue; } - qDebug() << "File copied successfully:" << debFile; +// qDebug() << "File copied successfully:" << debFile; } //完成返回界面 buildResultWidget *m_buildResult = new buildResultWidget(); diff --git a/src/build/buildcheckwidget.cpp b/src/build/buildcheckwidget.cpp index 1ff1d99..a7c9f69 100644 --- a/src/build/buildcheckwidget.cpp +++ b/src/build/buildcheckwidget.cpp @@ -16,7 +16,7 @@ void buildCheckWidget::buildCopy(){ QString m_debPath = QDir::homePath() + "/.cache/theme-build/" + FileProcess::g_date + "/src"; QDir m_debSource = m_debPath +"/debian/source"; - qDebug()<begin(); it != map->end(); ++it) { - qDebug() << it.key(); +// qDebug() << it.key(); } // 打印在文件夹里存在且在map中的key中存在的文件名 diff --git a/src/fileProcess/fileprocess.cpp b/src/fileProcess/fileprocess.cpp index a1284c7..edb809f 100644 --- a/src/fileProcess/fileprocess.cpp +++ b/src/fileProcess/fileprocess.cpp @@ -66,7 +66,7 @@ void FileProcess::FileCreate(const QString &m_themeType){ QDateTime currentDateTime = QDateTime::currentDateTime(); g_date = currentDateTime.toString("yyyyMMddhhmmss"); - qDebug()<< g_date; +// qDebug()<< g_date; //创建新的记录文件目录 QString m_themePath = QDir::homePath() + "/.cache/theme-build/" + g_date; diff --git a/src/fileProcess/historyinfoload.cpp b/src/fileProcess/historyinfoload.cpp index 030e175..90cc2be 100644 --- a/src/fileProcess/historyinfoload.cpp +++ b/src/fileProcess/historyinfoload.cpp @@ -300,9 +300,9 @@ void HistoryInfoLoad::getRadius() QJsonObject rootObj = jsonDoc.object(); QJsonObject radiusObj = rootObj["Radius"].toObject(); - qDebug() << "Normal_Radius value:" << radiusObj["Normal_Radius"].toObject()["value"]; - qDebug() << "radiusObj:" << radiusObj; - qDebug() << "Normal_Radius value type:" << radiusObj["Normal_Radius"].toObject()["value"].type(); +// qDebug() << "Normal_Radius value:" << radiusObj["Normal_Radius"].toObject()["value"]; +// qDebug() << "radiusObj:" << radiusObj; +// qDebug() << "Normal_Radius value type:" << radiusObj["Normal_Radius"].toObject()["value"].type(); QString normalRadiusValue = radiusObj["Normal_Radius"].toObject()["value"].toString(); m_historyInfo.radius = normalRadiusValue.toInt(); @@ -470,7 +470,7 @@ void HistoryInfoLoad::getWindowRadius() int windowRadiusValue = lineContent.toInt(&conversionSuccess); if (conversionSuccess) { m_historyInfo.windowradius = windowRadiusValue; - qDebug() << "m_historyInfo.windowradius" << windowRadiusValue; +// qDebug() << "m_historyInfo.windowradius" << windowRadiusValue; } else { qDebug() << "无法将字符串转换为整数:" << lineContent; } @@ -486,7 +486,7 @@ void HistoryInfoLoad::getWindowRadius() */ HistoryInfo HistoryInfoLoad::getInfoData() { - qDebug()<show(); - qDebug()<<"grub"<updateHistoryDir(); diff --git a/src/module/cursorthemefeature.cpp b/src/module/cursorthemefeature.cpp index 53cedf0..67b5c20 100644 --- a/src/module/cursorthemefeature.cpp +++ b/src/module/cursorthemefeature.cpp @@ -281,7 +281,6 @@ void CursorImageWidget::updateIcon(const QString& widgetName, const QString& new newPixmapItem->setData(0, widgetName); newPixmapItem->setData(1, newFilePath); newPixmapItem->setPos(oldPosition); - qDebug()<<"-----------------"; } else { qDebug() << "Failed to load image:" << newFilePath; } diff --git a/src/module/cursorthemewidget.cpp b/src/module/cursorthemewidget.cpp index 303b00b..2688a2c 100644 --- a/src/module/cursorthemewidget.cpp +++ b/src/module/cursorthemewidget.cpp @@ -301,7 +301,6 @@ void CursorThemeWidget::initRightWidget() // 设置widget的默认图标为filePath指定的文件路径 widget->setdefaulticon(filePath); widget->setProperty("widgetname",widgetName); - qDebug()<<"aaaaaaaaaaaaaaaaaaaaaaa"<setDisabled(true); line->setFixedHeight(1); @@ -531,7 +530,7 @@ void CursorThemeWidget::initBuildWidget() QString widgetName = widget->property("widgetname").toString(); QString fileName = QFileInfo(filePath).baseName(); if (fileName == widgetName) { - qDebug() << "File Path: " << filePath << " contains Widget Name: " << widgetName; +// qDebug() << "File Path: " << filePath << " contains Widget Name: " << widgetName; if(FileCheck::isLegalCursorFile(filePath)){ if(m_customiconpathmap->contains(widgetName)){ @@ -552,7 +551,7 @@ void CursorThemeWidget::initBuildWidget() QString fileName = QFileInfo(filePath).baseName(); QString widgetName = widget->property("widgetname").toString(); if (fileName == widgetName) { - qDebug() << "File Path: " << filePath << " contains Widget Name: " << widgetName; +// qDebug() << "File Path: " << filePath << " contains Widget Name: " << widgetName; if(FileCheck::isLegalCursorFile(filePath)){ if(m_timecustomiconpathmap->contains(widgetName)){ diff --git a/src/module/globalthemefeature.cpp b/src/module/globalthemefeature.cpp index 08e0f32..507a84f 100644 --- a/src/module/globalthemefeature.cpp +++ b/src/module/globalthemefeature.cpp @@ -443,7 +443,7 @@ void RoundedWidget::setRadius(int radius) void RoundedWidget::setTransparency(int transparency) { m_transparency = transparency / 100.0; - qDebug()<hasUrls()) { QList urlList = mimeData->urls(); for (const QUrl &url : urlList) { - qDebug() << "File path:" << url.toLocalFile(); +// qDebug() << "File path:" << url.toLocalFile(); bool islegal = FileCheck::isLegalWallPaperFile(url.toLocalFile(),m_type); if(islegal){ @@ -722,7 +722,7 @@ void addPicWidget::dropEvent(QDropEvent *event) QList urlList = mimeData->urls(); for (const QUrl &url : urlList) { - qDebug() << "File path:" << url.toLocalFile(); +// qDebug() << "File path:" << url.toLocalFile(); bool islegal = FileCheck::isLegalWallPaperFile(url.toLocalFile(),m_type); if(islegal){ //发信号给widget,换图标 diff --git a/src/module/globalthemewidget.cpp b/src/module/globalthemewidget.cpp index c78b620..89503dd 100644 --- a/src/module/globalthemewidget.cpp +++ b/src/module/globalthemewidget.cpp @@ -617,9 +617,9 @@ void GlobalThemeWidget::initAccentColorWidget() QColor selectedColor = m_combobox->itemData(index).value(); - qDebug() << "Selected color:" << selectedColor; +// qDebug() << "Selected color:" << selectedColor; - qDebug() << "RGB values:" << selectedColor.red() << selectedColor.green() << selectedColor.blue(); +// qDebug() << "RGB values:" << selectedColor.red() << selectedColor.green() << selectedColor.blue(); m_preview->updatescale(); m_preview->updateButtonColor(selectedColor); emit newAccentColor(selectedColor); diff --git a/src/module/grubthemefeature.cpp b/src/module/grubthemefeature.cpp index 63efcd3..8a5909c 100644 --- a/src/module/grubthemefeature.cpp +++ b/src/module/grubthemefeature.cpp @@ -292,7 +292,7 @@ void GrubEditButton::dropEvent(QDropEvent *event) if (mimeData->hasUrls()) { QList urlList = mimeData->urls(); for (const QUrl &url : urlList) { - qDebug() << "File path:" << url.toLocalFile(); +// qDebug() << "File path:" << url.toLocalFile(); bool islegal = FileCheck::isLegalWallPaperFile(url.toLocalFile(),"grub"); if(islegal){ @@ -363,7 +363,7 @@ void grubAddPicWidget::dropEvent(QDropEvent *event) QList urlList = mimeData->urls(); for (const QUrl &url : urlList) { - qDebug() << "File path:" << url.toLocalFile(); +// qDebug() << "File path:" << url.toLocalFile(); bool islegal = FileCheck::isLegalWallPaperFile(url.toLocalFile(),"grub"); if(islegal){ //发信号给widget,换图标 diff --git a/src/module/historywidget.cpp b/src/module/historywidget.cpp index 5d74d11..a2c34f6 100644 --- a/src/module/historywidget.cpp +++ b/src/module/historywidget.cpp @@ -68,7 +68,7 @@ HistoryWidget::HistoryWidget(QWidget *parent) : QWidget(parent) QDateTime folderDateTime = QDateTime::fromString(yearStr + monthStr + dayStr + hourStr + minuteStr + secondStr, "yyyyMMddhhmmss"); if (folderDateTime.isValid() && folderDateTime.daysTo(currentDate) <= 30) { - qDebug() << "Processing folder: " << folder; +// qDebug() << "Processing folder: " << folder; validFolders.prepend(folder); } } diff --git a/src/module/iconthemewidget.cpp b/src/module/iconthemewidget.cpp index a528d5b..2d10d83 100644 --- a/src/module/iconthemewidget.cpp +++ b/src/module/iconthemewidget.cpp @@ -433,7 +433,7 @@ void IconThemeWidget::initSystemEditWidget() clickedWidget->setcustomicon(newFilePath); // 输出选择的文件路径和对应的widgetName。 - qDebug() << "Selected file path:" << newFilePath<< "Corresponding widgetName:" << widgetName; +// qDebug() << "Selected file path:" << newFilePath<< "Corresponding widgetName:" << widgetName; // 更新系统预览图标的显示。 m_systempreview->updateIcon(widgetName, newFilePath); } @@ -522,7 +522,7 @@ void IconThemeWidget::initPlaceandDeviceEditWidget() m_placescustomiconpathmap->insert(widgetName, newFilePath); clickedWidget->setcustomicon(newFilePath); - qDebug() << "Selected file path:" << newFilePath<< "Corresponding widgetName:" << widgetName; +// qDebug() << "Selected file path:" << newFilePath<< "Corresponding widgetName:" << widgetName; m_placepreview->updateIcon(widgetName, newFilePath); } } @@ -595,7 +595,7 @@ void IconThemeWidget::initPlaceandDeviceEditWidget() if(FileCheck::isLegalIconFile(newFilePath)){ m_devicescustomiconpathmap->insert(widgetName, newFilePath); clickedWidget->setcustomicon(newFilePath); - qDebug() << "Selected file path:" << newFilePath<< "Corresponding widgetName:" << widgetName; +// qDebug() << "Selected file path:" << newFilePath<< "Corresponding widgetName:" << widgetName; // m_placepreview->updateIcon(widgetName, newFilePath); } @@ -697,7 +697,7 @@ void IconThemeWidget::initBatchEditWidget() QString fileName = QFileInfo(filePath).baseName(); QString widgetName = widget->property("widgetname").toString(); if (fileName == widgetName) { - qDebug() << "File Path: " << filePath << " contains Widget Name: " << widgetName; +// qDebug() << "File Path: " << filePath << " contains Widget Name: " << widgetName; if(FileCheck::isLegalIconFile(filePath)){ if(m_stackedwidget->currentIndex() == 0){ m_customiconpathmap->insert(widgetName, filePath); @@ -737,7 +737,7 @@ void IconThemeWidget::initBatchEditWidget() for (IconEditWidget *widget : childWidgets) { QString widgetName = widget->property("widgetname").toString(); if (fileName == widgetName) { - qDebug() << "File Path: " << filePath << " contains Widget Name: " << widgetName; +// qDebug() << "File Path: " << filePath << " contains Widget Name: " << widgetName; if(FileCheck::isLegalIconFile(filePath)){ if(m_stackedwidget->currentIndex() == 2){ m_devicescustomiconpathmap->insert(widgetName, filePath); diff --git a/src/module/iconwidgetfeature.cpp b/src/module/iconwidgetfeature.cpp index bd39f59..0989eb3 100644 --- a/src/module/iconwidgetfeature.cpp +++ b/src/module/iconwidgetfeature.cpp @@ -487,13 +487,13 @@ void ImageWidget::updateIcon(const QString& widgetName, const QString& newFilePa { QGraphicsScene* scene = graphicsView->scene(); QList items = scene->items(); - for (int i = 0; i < items.size(); ++i) { - QGraphicsItem* item = items.at(i); - // 输出item的内容,例如位置和类型等信息 - qDebug() << "Item" << i << ":" - << "Position:" << item->pos() - << "Type:" << item->type(); - } +// for (int i = 0; i < items.size(); ++i) { +// QGraphicsItem* item = items.at(i); +// // 输出item的内容,例如位置和类型等信息 +// qDebug() << "Item" << i << ":" +// << "Position:" << item->pos() +// << "Type:" << item->type(); +// } // 遍历所有的图形项 for (QGraphicsItem* item : items) { // 尝试将当前图形项转换为图形位图项 @@ -913,7 +913,7 @@ void DropButton::dropEvent(QDropEvent *event) if (mimeData->hasUrls()) { QList urlList = mimeData->urls(); for (const QUrl &url : urlList) { - qDebug() << "File path:" << url.toLocalFile(); +// qDebug() << "File path:" << url.toLocalFile(); bool islegal = FileCheck::isLegalIconFile(url.toLocalFile()); if(islegal){ //发信号给widget,换图标 @@ -977,7 +977,7 @@ void addIconWidget::dropEvent(QDropEvent *event) if (mimeData->hasUrls()) { QList urlList = mimeData->urls(); for (const QUrl &url : urlList) { - qDebug() << "File path:" << url.toLocalFile(); +// qDebug() << "File path:" << url.toLocalFile(); bool islegal = FileCheck::isLegalIconFile(url.toLocalFile()); if(islegal){ //发信号给widget,换图标 diff --git a/src/module/infocreatewidget.cpp b/src/module/infocreatewidget.cpp index 22c766c..856fd4c 100644 --- a/src/module/infocreatewidget.cpp +++ b/src/module/infocreatewidget.cpp @@ -458,13 +458,13 @@ void InfoCreateWidget::renameDesktop() void InfoCreateWidget::createControlChangelog(const QString &m_date){ //点击生成制作主题包按钮时,m_date将设为空 - qDebug()<width() - pixmap.width()) / 2; - qDebug()<<"x= "<width()"<width()<<" pixmap.width()" << pixmap.width(); +// qDebug()<<"x= "<width()"<width()<<" pixmap.width()" << pixmap.width(); qreal y = (scene->height() - pixmap.height()) / 2; sceneWidth = scene->width(); sceneHeight = scene->height(); diff --git a/translation/themebuilder_en_US.ts b/translation/themebuilder_en_US.ts index 0cbc357..d6e03c6 100644 --- a/translation/themebuilder_en_US.ts +++ b/translation/themebuilder_en_US.ts @@ -263,27 +263,27 @@ - + Window fillet - + Large - + Medium - + Small - + Start Global Theme Building @@ -906,62 +906,63 @@ MainWindow - + + kylin-theme-builder - + User guide - + Global Theme - + Topics include basic styles for windows and controls, icons, cursors, and more! - + Icon Theme - + The icon theme includes multiple application icons and system settings homepage icons. - + Cursor Theme - + Cursor theme for pointer cursor icon - + Plymouth Theme - + Boot animation can be customized to boot screen effect - + GRUB Theme - + Modify GRUB background wallpaper diff --git a/translation/themebuilder_zh_CN.qm b/translation/themebuilder_zh_CN.qm index 6a4ebe7..533665b 100644 Binary files a/translation/themebuilder_zh_CN.qm and b/translation/themebuilder_zh_CN.qm differ diff --git a/translation/themebuilder_zh_CN.ts b/translation/themebuilder_zh_CN.ts index 4efd691..9361b2e 100644 --- a/translation/themebuilder_zh_CN.ts +++ b/translation/themebuilder_zh_CN.ts @@ -271,27 +271,27 @@ 窗口透明度 - + Window fillet 窗口圆角 - + Large - + Medium - + Small - + Start Global Theme Building 制作全局主题 @@ -469,7 +469,7 @@ folder-dropbox - + 升降箱 @@ -946,62 +946,63 @@ MainWindow - + + kylin-theme-builder 主题制作工坊 - + User guide 使用指南 - + Global Theme 全局主题 - + Topics include basic styles for windows and controls, icons, cursors, and more! 主题包含窗口与控件基础样式、图标、光标等内容 - + Icon Theme 图标主题 - + The icon theme includes multiple application icons and system settings homepage icons. 图标主题包含系统自带多个应用图标和系统设置首页图标 - + Cursor Theme 光标主题 - + Cursor theme for pointer cursor icon 光标主题为指针光标图标 - + Plymouth Theme 开机动画 - + Boot animation can be customized to boot screen effect 开机动画可以自定义开机界面效果 - + GRUB Theme GRUB背景 - + Modify GRUB background wallpaper 修改 GRUB 背景壁纸