diff --git a/debian/changelog b/debian/changelog index 3f61047..91e82f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -kylin-theme-builder (1.0.0.1-ok1.7) nile; urgency=medium +kylin-theme-builder (1.0.0.1-ok1.8) nile; urgency=medium * BUG: I8LFHX/I8LF69/I8L3MI/I8L2J/I8L25C/I8L23U/I8L1ZB/I8L1HT/I8L0QY/I8L0Q8/I8L0PN * 需求号：无 diff --git a/kylin-theme-builder.pro.user b/kylin-theme-builder.pro.user new file mode 100644 index 0000000..322c6ab --- /dev/null +++ b/kylin-theme-builder.pro.user @@ -0,0 +1,260 @@ + + + + + + EnvironmentId + {555ed999-f640-41a4-be48-5c1db8664450} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + false + true + false + 0 + true + true + 0 + 8 + true + false + 1 + true + true + true + *.md, *.MD, Makefile + false + true + + + + ProjectExplorer.Project.PluginSettings + + + true + false + true + true + true + true + + + 0 + true + + true + true + Builtin.DefaultTidyAndClazy + 6 + + + + true + + + + + ProjectExplorer.Project.Target.0 + + Desktop + 桌面 + 桌面 + {095bf34e-29d2-428e-94ff-958e02991e74} + 0 + 0 + 0 + + 0 + /home/openKylin/kwz/build-kylin-theme-builder-unknown-Debug + /home/openKylin/kwz/build-kylin-theme-builder-unknown-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + /home/openKylin/kwz/build-kylin-theme-builder-unknown-Release + /home/openKylin/kwz/build-kylin-theme-builder-unknown-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + /home/openKylin/kwz/build-kylin-theme-builder-unknown-Profile + /home/openKylin/kwz/build-kylin-theme-builder-unknown-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + true + + 2 + + ProjectExplorer.CustomExecutableRunConfiguration + + false + true + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/src/maininterface.cpp b/src/maininterface.cpp index d114bb9..f49b907 100644 --- a/src/maininterface.cpp +++ b/src/maininterface.cpp @@ -143,15 +143,17 @@ void MainInterface::init() m_themestackedwidget->setCurrentIndex(4); m_grubbtn->setChecked(true); }); - InfoCreateWidget *info = new InfoCreateWidget(nullptr,"create"); - connect(m_buildbtn,&QPushButton::clicked,info,[=](){ + connect(m_buildbtn,&QPushButton::clicked,this,[=](){ + m_info = new InfoCreateWidget(nullptr,"create"); FileProcess getInfo; - info->getFileInfo(getInfo.FileSearch(FileProcess::g_date)); - info->show(); + m_info->getFileInfo(getInfo.FileSearch(FileProcess::g_date)); + m_info->show(); // connect(info,&InfoCreateWidget::readytoBuild,this,&MainInterface::startCopy); - connect(info,&InfoCreateWidget::gohomesignals,this,[=](){ + connect(m_info,&InfoCreateWidget::gohomesignals,this,[=](){ //发送返回主界面信号给mainwindow + GlobalThemeWidget::g_themeChange = true; emit gohomesignals(); + delete m_info; }); }); // connect() diff --git a/src/maininterface.h b/src/maininterface.h index ba004f0..4b97066 100644 --- a/src/maininterface.h +++ b/src/maininterface.h @@ -86,6 +86,7 @@ private: PlymouthThemeWidget *m_plymouththemewidget; GrubThemeWidget *m_grubthemewidget; QStackedWidget *m_themestackedwidget; + InfoCreateWidget *m_info; QHBoxLayout *m_layout; BaseLeftWidget *m_navigationwidget; diff --git a/src/titlebar.cpp b/src/titlebar.cpp index 3998d9c..9a81452 100644 --- a/src/titlebar.cpp +++ b/src/titlebar.cpp @@ -24,7 +24,7 @@ TitleBar::TitleBar(QWidget *parent) : QWidget(parent) QPixmap pixmap = scaledIcon.pixmap(QSize(30, 30)); iconlabel->setPixmap(pixmap); - QLabel *title = new QLabel("主题制作工具"); + QLabel *title = new QLabel("主题制作工坊"); m_gohomebtn = new QPushButton(); m_gohomebtn->setFixedSize(30,30); diff --git a/translation/themebuilder_en_US.ts b/translation/themebuilder_en_US.ts index 2427726..be64d97 100644 --- a/translation/themebuilder_en_US.ts +++ b/translation/themebuilder_en_US.ts @@ -12,14 +12,14 @@ CursorThemeWidget - - + + Select SVG file - - + + SVG file (*.svg) @@ -31,6 +31,8 @@ + + error @@ -54,113 +56,123 @@ The file size cannot exceed 5MB + + + The file size cannot exceed 1MB + + + + + The file size cannot exceed 20KB + + GlobalThemeWidget - + Overall theme rendering - - + + Select picture file - - + + Picture file (*.png *.jpg) - + Desktop wallpaper - + Window appearance - + light - + dark - + Control fillet - + Accent colour - + daybreakBlue - + jamPurple - + magenta - + sunRed - + sunsetOrange - + dustGold - + polarGreen - + Window transparency - + Window fillet - + Large - + Medium - + Small @@ -194,24 +206,24 @@ IconThemeWidget - - + + Select SVG file - - + + SVG file (*.svg) - + APP - + System setting @@ -284,52 +296,52 @@ MainInterface - + GlobalTheme - + IconTheme - + CursorTheme - + PlymouthTheme - + GrubTheme - + Start Global Theme Building - + Start Icon Theme Building - + Start Cursor Theme Building - + Start Plymouth Theme Building - + Start Grub Theme Building @@ -337,62 +349,62 @@ 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 GURB background wallpaper @@ -410,12 +422,12 @@ - + Select MP4 file - + MP4 file (*.mp4) @@ -442,27 +454,47 @@ TitleBar - + + Return + + + + + Minimize + + + + + Maximize + + + + + Close + + + + Menu - + Save path - + about - + help - + exit diff --git a/translation/themebuilder_zh_CN.qm b/translation/themebuilder_zh_CN.qm index 2293170..6072cd8 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 f0baa81..1656429 100644 --- a/translation/themebuilder_zh_CN.ts +++ b/translation/themebuilder_zh_CN.ts @@ -6,20 +6,20 @@ Kylin Theme Builder - + 主题制作工坊 CursorThemeWidget - - + + Select SVG file 选择SVG文件 - - + + SVG file (*.svg) SVG 文件 (*.svg) @@ -31,6 +31,8 @@ + + error 错误 @@ -54,113 +56,123 @@ The file size cannot exceed 5MB 文件大小不能超过5MB + + + The file size cannot exceed 1MB + 文件大小不能超过5MB {1M?} + + + + The file size cannot exceed 20KB + 文件大小不能超过5MB {20K?} + GlobalThemeWidget - + Overall theme rendering 全局主题效果图 - - + + Select picture file 选择图片文件 - - + + Picture file (*.png *.jpg) 图片文件 (*.png *.jpg) - + Desktop wallpaper 桌面壁纸 - + Window appearance 窗口外观 - + light 浅色 - + dark 深色 - + Control fillet 控件圆角 - + Accent colour 强调色 - + daybreakBlue 拂晓蓝 - + jamPurple 果酱紫 - + magenta 玫瑰红 - + sunRed 烈日红 - + sunsetOrange 日暮橙 - + dustGold 薄雾金 - + polarGreen 极光绿 - + Window transparency 窗口透明度 - + Window fillet 窗口圆角 - + Large 大 - + Medium 中 - + Small 小 @@ -175,7 +187,7 @@ Picture file (*.png) - + 图片文件 (*.png) Picture file (*.png *.jpg) @@ -198,24 +210,24 @@ IconThemeWidget - - + + Select SVG file 选择SVG文件 - - + + SVG file (*.svg) SVG 文件 (*.svg) - + APP APP - + System setting 系统设置 @@ -262,7 +274,7 @@ Please enter less than 15 characters - + 请保障输入内容小于15个字节 @@ -282,58 +294,58 @@ Please enter less than 35 characters - + 请保障输入内容小于35个字节 MainInterface - + GlobalTheme 全局样式 - + IconTheme 图标主题 - + CursorTheme 光标主题 - + PlymouthTheme 开机动画 - + GrubTheme 启动个性化 - + Start Global Theme Building 开始制作全局主题 - + Start Icon Theme Building 开始制作图标主题 - + Start Cursor Theme Building 开始制作光标主题 - + Start Plymouth Theme Building 开始制作开机动画主题 - + Start Grub Theme Building 开始制作Grub主题 @@ -345,62 +357,62 @@ 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 GURB background wallpaper 修改GURB背景壁纸 @@ -422,22 +434,22 @@ Select Png file - + 选择图片文件 Png file (*.png) - + 图片文件 - + Select MP4 file 选择MP4文件 - + MP4 file (*.mp4) - + MP4文件 (*.mp4) MP4 file (*.svg *.png *.gif *.mp4) @@ -450,43 +462,63 @@ Storage Path: - + 生成deb包路径 Modify - + 修改 Confirm - + 确认 TitleBar - + + Return + 返回 + + + + Minimize + 最小化 + + + + Maximize + 最大化 + + + + Close + 关闭 + + + Menu 菜单 - + Save path 保存路径 - + about 关于 - + help 帮助 - + exit 退出 @@ -496,7 +528,7 @@ cancel - + 取消