Compare commits

6 Commits
1.0 ... main

Author SHA1 Message Date
zj
633611cbcf fix 2026-01-13 21:15:31 +08:00
zj
f6c004dae2 fix 2026-01-03 16:01:17 +08:00
zj
5494630608 update 2026-01-02 03:53:54 +08:00
zj
4dd522a534 add new theme 2026-01-01 15:00:05 +08:00
zj
4293f31dc8 fix calamares-png 2025-12-31 16:20:02 +08:00
zj
b75235b0d4 change bbt to tms 2025-12-30 17:42:04 +08:00
42 changed files with 300 additions and 333 deletions

View File

@@ -1,19 +1,18 @@
# Maintainer: zj <1052308357@qq.com>
pkgname=bbt-calamares-config
pkgname=tms-calamares-config
_destname1="/etc"
pkgver=25.12
pkgrel=16
pkgver=$(date +%Y.%m)
pkgrel=$(date +%d)
pkgdesc="calamares for bbt"
arch=('any')
url="https://yuyujing.cn"
license=('GPL3')
makedepends=('git')
depends=()
conflicts=('alci-calamares-config-dev' 'alci-calamares-config-pure' 'alci-calamares-config-btrfs')
provides=("${pkgname}")
options=(!strip !emptydirs)
source=("bbt-calamares-config.zip")
sha256sums=('9c9e31f3671cbc9a3ff64cdb07af28626f68023713ccc7e7878357eada0ba1a3')
source=("tms-calamares-config.zip")
sha256sums=('SKIP')
package() {
install -dm755 ${pkgdir}${_destname1}
cp -r ${srcdir}/${pkgname}${_destname1}/* ${pkgdir}${_destname1}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

View File

@@ -1,2 +0,0 @@
SPDX-FileCopyrightText: 2014 Teo Mrnjavac <teo@kde.org>
SPDX-License-Identifier: GPL-3.0-or-later

View File

@@ -1,282 +0,0 @@
/*
A branding component can ship a stylesheet (like this one)
which is applied to parts of the Calamares user-interface.
In principle, all parts can be styled through CSS.
Missing parts should be filed as issues.
The IDs are based on the object names in the C++ code.
You can use the Debug Dialog to find out object names:
- Open the debug dialog
- Choose tab *Tools*
- Click *Widget Tree* button
The list of object names is printed in the log.
Documentation for styling Qt Widgets through a stylesheet
can be found at
https://doc.qt.io/qt-5/stylesheet-examples.html
https://doc.qt.io/qt-5/stylesheet-reference.html
In Calamares, styling widget classes is supported (e.g.
using `QComboBox` as a selector).
This example stylesheet has all the actual styling commented out.
The examples are not exhaustive.
*/
/* ########## MAIN APPLICATION WINDOW ########## */
#mainApp {
}
#mainText{
font : bold 16px;
}
#sidebarApp {
}
#logoApp {
}
#sidebarMenuApp {
padding: 3px;
background-color: #292F34;
}
QWidget {
font: 16px;
}
QTextEdit, QListView {
}
QDialogButtonBox {
}
QAbstractSpinBox {
}
QListWidget::item:alternate {
}
#debugButton {
font: bold 8px;
color: #FFFFFF;
}
/* ########## TOOLTIP ########## */
QPushButton {
font : 16px;
}
QDialogButtonBox {
dialogbuttonbox-buttons-have-icons: 0;
}
/* ########## QLIST VIEW ########## */
QListView {
font: 16px;
}
/* ########## QLINE EDIT ########## */
QLineEdit#LE_TestKeyboard {
font: 16px;
}
QLineEdit#m_passphraseLineEdit, QLineEdit#vgName,
QLineEdit#m_confirmLineEdit {
font: 16px;
}
QLineEdit#textBoxUserVerifiedPassword, QLineEdit#textBoxVerifiedRootPassword {
font: 16px;
}
QLineEdit#textBoxFullName, QLineEdit#textBoxLoginName, QLineEdit#textBoxHostName,
QLineEdit#textBoxUserPassword, QLineEdit#textBoxRootPassword {
font: 16px;
}
#textBoxFullName, #textBoxLoginName, #textBoxHostName, #textBoxUserPassword,
#textBoxRootPassword, #textBoxAutoLogin, #vgName {
font: 16px;
}
#textBoxUserVerifiedPassword, #textBoxVerifiedRootPassword,
#LE_TestKeyboard, #m_confirmLineEdit, #m_passphraseLineEdit {
font: 16px;
}
/* ##########PARTITION ########## */
#partResizerWidget {
font: 16px;
}
/* ########## PAGE_USERSETUP ########## */
#labelWhatIsYourName {
font: 16px;
}
#textBoxFullName {
font: 16px;
}
#labelFullName {
font: 16px;
}
#labelFullNameError {
font: 16px;
}
#username_label_2 {
font: 16px;
}
#textBoxLoginName {
font: 16px;
}
#labelUsername {
font: 16px;
}
#labelUsernameError {
font: 16px;
}
#hostname_label_2 {
font: 16px;
}
#textBoxHostName {
font: 16px;
}
#labelHostname {
font: 16px;
}
#labelHostnameError {
font: 16px;
}
#password_label_2 {
font: 16px;
}
#textBoxUserPassword {
font: 16px;
}
#textBoxUserVerifiedPassword {
font: 16px;
}
#labelUserPassword {
font: 16px;
}
#labelUserPasswordError {
font: 16px;
}
#checkBoxRequireStrongPassword {
font: 16px;
}
#checkBoxDoAutoLogin {
font: 16px;
}
#checkBoxReusePassword {
font: 16px;
}
#labelChooseRootPassword {
font: 16px;
}
#textBoxRootPassword {
font: 16px;
}
#textBoxVerifiedRootPassword {
font: 16px;
}
#labelRootPassword {
font: 16px;
}
#labelRootPasswordError {
font: 16px;
}
/* ########## COMBO BOX ########## */
QComboBox {
font: 16px;
}
#mountPointComboBox::drop-down {
font: 16px;
}
/* ########## SPIN BOX ########## */
QSpinBox {
font: 16px;
}
QLineEdit {
font: 16px;
}
/* ########## TREE VIEW ########## */
QTreeView {
font: 16px;
show-decoration-selected: 0;
}
QTreeView::item {
padding: 2px;
}
QTreeView::branch:has-siblings:!adjoins-item {
}
QTreeView::branch:has-siblings:adjoins-item {
}
QTreeView::branch:!has-children:!has-siblings:adjoins-item {
}
QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings {
}
QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings {
}
/* ########## CHECK BOX ########## */
QCheckBox {
}
QCheckBox::indicator:unchecked {
}
QCheckBox::indicator:checked {
}
QItemSelectionModel::Select {
}
/* ########## HEADER VIEW ########## */
QHeaderView::section {
font : 16px;
}
#debugButton {
background-color: none;
font: 12px;
color: #edecf0;
height: 32px;
border: none;
}
#debugButton:hover {
color: #ff7f7f;
}
#aboutButton {
background-color: none;
font: 12px;
color: #edecf0;
height: 32px;
border: none;
}

View File

@@ -1,10 +1,11 @@
#!/bin/bash
rm -rf pkg src bbt-calamares-config.zip bbt-calamares-config*.pkg.tar.zst
rm -rf pkg src tms-calamares-config.zip tms-calamares-config*.pkg.tar.zst
zip -ry bbt-calamares-config.zip bbt-calamares-config
zip -ry tms-calamares-config.zip tms-calamares-config
makepkg -s
mv bbt-calamares-config*.pkg.tar.zst /home/smart/tms/custompkgs/x86_64/
#echo "use makepkg -s"
#mv tms-calamares-config*.pkg.tar.zst /home/smart/tms/custompkgs/x86_64/

View File

Before

Width:  |  Height:  |  Size: 2.0 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

View File

Before

Width:  |  Height:  |  Size: 2.5 MiB

After

Width:  |  Height:  |  Size: 2.5 MiB

View File

Before

Width:  |  Height:  |  Size: 2.0 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

View File

@@ -39,7 +39,7 @@ welcomeExpandingLogo: true
# - "normal" or unset, expand as needed, use *windowSize*
# - "fullscreen", start as large as possible, ignore *windowSize*
# - "noexpand", don't expand automatically, use *windowSize*
windowExpanding: normal
windowExpanding: fullscreen
# Size of Calamares window, expressed as w,h. Both w and h
# may be either pixels (suffix px) or font-units (suffix em).
@@ -48,13 +48,13 @@ windowExpanding: normal
# This setting is ignored if "fullscreen" is selected for
# *windowExpanding*, above. If not set, use constants defined
# in CalamaresUtilsGui, 800x520.
windowSize: 1024px,735px
#windowSize: 1024px,735px
# Placement of Calamares window. Either "center" or "free".
# Whether "center" actually works does depend on the window
# manager in use (and only makes sense if you're not using
# *windowExpanding* set to "fullscreen").
windowPlacement: center
#windowPlacement: center
### PANELS CONFIGURATION
#
@@ -175,8 +175,8 @@ images:
# branding component also ships a stylesheet.qss. Then they are
# the corresponding CSS attributes of #sidebarApp.
style:
SidebarBackground: "#292F34"
SidebarText: "#FFFFFF"
SidebarBackground: "#FAD59E"
SidebarText: "#3E3E6E"
### SLIDESHOW
#
@@ -221,5 +221,5 @@ slideshowAPI: 2
# Takes string as input. Important bits are the host and port,
# the scheme is not used.
uploadServer :
type : "fiche"
type : "none"
url : "http://termbin.com:9999"

View File

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@@ -0,0 +1,279 @@
/*
* Calamares Stylesheet for Bobocorn Branding - Lighter Yellow Sidebar, Light Main Background
* Based on logo colors:
* - Sidebar Background (Lighter Orange/Yellow): #FAD59E
* - Main Background (Very Pale Warm Yellow): #FFFBF0
* - Main Text/Dark Accent (Dark Blue/Purple): #3E3E6E
* - Primary Accent (Light Blue/Cyan): #8DD0D9
* - Secondary Accent (Pink/Red): #E75677
*/
/* ########## 全局设置 ########## */
/* 整个应用程序的默认字体和颜色 */
QWidget {
font: 16px "Noto Sans CJK SC", "Microsoft YaHei", sans-serif;
color: #3E3E6E; /* 默认文字颜色为深紫/蓝 */
background-color: #FFFBF0; /* 全局背景色设为非常浅的暖黄色 */
}
/* 主内容区域的背景色 */
QWizardPage {
background-color: #FFFBF0; /* 主内容区背景色设为非常浅的暖黄色 */
}
/* ########## 侧边栏 ########## */
/* 侧边栏整体背景和文字颜色 */
#sidebarApp { /* Calamares 侧边栏的根容器 ID */
background-color: #FAD59E; /* 侧边栏改为更淡的橙黄色,柔和不刺眼 */
color: #3E3E6E; /* 深紫/蓝文字 */
}
/* 侧边栏菜单列表的背景,确保与 #sidebarApp 背景一致 */
#sidebarMenuApp { /* 侧边栏内部的 QListWidget 的 ID */
padding: 3px;
background-color: #FAD59E; /* 确保与 #sidebarApp 背景一致 */
}
/* 侧边栏未选中项的样式 */
#sidebarMenuApp QListWidget::item {
background-color: transparent; /* 透明背景 */
color: #3E3E6E; /* 深紫/蓝文字 */
padding: 8px 15px; /* 内边距 */
}
/* 侧边栏选中项的样式 */
#sidebarMenuApp QListWidget::item:selected {
background-color: #8DD0D9; /* 浅蓝/青 (主要强调色) */
color: #3E3E6E; /* 深紫/蓝 (在浅蓝背景上更清晰) */
border-radius: 3px; /* 稍微圆角 */
}
/* 鼠标悬停在侧边栏项上时的样式 */
#sidebarMenuApp QListWidget::item:hover {
background-color: #F5BE7A; /* 鼠标悬停时,比侧边栏背景稍深一点的橙黄色 */
}
/* Logo 区域 - 重点修改这里 */
#logoApp {
padding: 0px; /* 减少所有方向的内边距给logo本身更多空间 */
min-height: 70px; /* 确保logo区域有足够的最小高度防止被挤压 */
min-width: 180px; /* 限制logo区域的最大宽度防止溢出 */
/* Logo区域背景色改为与主内容区一致使其更亮与菜单区域区分 */
border-bottom: 2px solid #1FB5ED; /* 添加一条细边框进一步区分logo区域和菜单列表 */
/* 垂直居中logo图片如果logo是QLabel或类似的并且其父容器是#logoApp */
/* 如果logo是直接设置在#logoApp的背景图片则需要调整背景图片属性 */
/* 如果logo是单独的QLabel可能需要调整其布局或alignment */
}
/* ########## 主内容区域标题和文本 ########## */
/* 主标题,例如 "欢迎使用 BBTTMS 安装程序" */
#mainText { /* 您的 qss 中已经有这个 ID */
font: bold 24px "Noto Sans CJK SC", "Microsoft YaHei", sans-serif;
color: #3E3E6E; /* 深紫/蓝,与主要文字色呼应 */
padding-bottom: 10px;
padding-top: 20px; /* 顶部留白 */
background-color: transparent; /* 确保标题背景透明,显示主内容区背景色 */
}
/* 普通标签文字颜色 */
QLabel {
color: #3E3E6E;
background-color: transparent; /* 确保标签背景透明,显示主内容区背景色 */
}
/* ########## 底部导航按钮 ########## */
/* 底部导航按钮的通用样式 */
QDialogButtonBox QPushButton { /* 针对 QDialogButtonBox 内部的 QPushButton */
background-color: #CCCCCC; /* 浅蓝/青 (主要强调色) */
color: #3E3E6E; /* 深紫/蓝 文字 */
border: none;
padding: 10px 20px;
border-radius: 5px;
font: bold 16px "Noto Sans CJK SC", "Microsoft YaHei", sans-serif;
min-width: 80px; /* 确保按钮有最小宽度 */
}
/* 鼠标悬停在导航按钮上时的样式 */
QDialogButtonBox QPushButton:hover {
background-color: #7BC4CC; /* 浅蓝/青 稍深 */
}
/* 鼠标按下导航按钮时的样式 */
QDialogButtonBox QPushButton:pressed {
background-color: #6AAEB6; /* 浅蓝/青 更深 */
}
/* "取消" 按钮的特定样式 */
QDialogButtonBox QPushButton[text="取消"] { /* 假设取消按钮的文本是 "取消" */
background-color: #E75677; /* 粉红/红 (次要强调色) */
color: #FFFFFF; /* 白色文字 */
}
QDialogButtonBox QPushButton[text="取消"]:hover {
background-color: #D04A6A; /* 粉红/红 稍深 */
}
QDialogButtonBox QPushButton[text="取消"]:pressed {
background-color: #B93E5A; /* 粉红/红 更深 */
}
/* ########## 输入框和下拉框 ########## */
/* 通用输入框样式 */
QLineEdit {
background-color: #FFFFFF; /* 白色背景,确保可读性 */
color: #3E3E6E; /* 深紫/蓝文字 */
border: 1px solid #CCCCCC; /* 浅灰色边框 */
border-radius: 3px;
padding: 5px;
font: 16px "Noto Sans CJK SC", "Microsoft YaHei", sans-serif;
}
/* QComboBox 的通用样式 (与 QLineEdit 分开,以便单独调整 padding) */
QComboBox {
background-color: #FFFFFF; /* 白色背景,确保可读性 */
color: #3E3E6E; /* 深紫/蓝文字 */
border: 1px solid #CCCCCC; /* 浅灰色边框 */
border-radius: 3px;
padding: 5px 26px 5px 5px; /* 右侧留出足够的空间给箭头 (24px 宽度 + 2px 额外间距) */
min-height: 24px; /* 确保最小高度 */
font: 16px "Noto Sans CJK SC", "Microsoft YaHei", sans-serif;
}
/* 鼠标悬停在输入框/下拉框上时的样式 */
QLineEdit:hover, QComboBox:hover {
border: 1px solid #B0B0B0; /* 悬停时边框颜色稍深 */
}
/* 输入框/下拉框获得焦点时的样式 */
QLineEdit:focus, QComboBox:focus {
border: 1px solid #8DD0D9; /* 焦点边框为浅蓝/青 */
outline: none;
}
/* 下拉框的下拉箭头区域 (即右侧可点击的箭头背景区域) */
QComboBox::drop-down {
subcontrol-origin: padding; /* 确保子控件的定位起点正确 */
// subcontrol-position: top right; /* 定位在右上角 */
width: 24px; /* 给予足够的宽度来显示箭头图标 */
border-left: 1px solid #CCCCCC; /* 左侧边框,与文本区域分隔开 */
border-top-right-radius: 3px; /* 匹配 QComboBox 的圆角 */
border-bottom-right-radius: 3px;
}
/* 鼠标悬停在下拉箭头区域时 */
QComboBox::drop-down:hover {
background-color: #E0E0E0; /* 悬停时背景稍深,提供视觉反馈 */
}
/* 针对下拉框中的向下箭头图标本身 */
QComboBox::down-arrow {
image: url(:/qt-project.org/styles/commonstyle/images/down-arrow.png); /* 使用 Qt 默认的向下箭头图标 */
width: 16px; /* 调整图标大小 */
height: 16px;
/* 可以通过 padding 或 margin 调整图标在 drop-down 区域内的位置,使其居中 */
}
/* 如果 QComboBox 是可编辑的,文本部分也需要留出空间 */
QComboBox:editable {
padding-right: 26px;
}
/* 下拉列表本身的样式 (例如,当点击箭头后弹出的列表) */
QComboBox QAbstractItemView {
border: 1px solid #BBBBBB; /* 下拉列表的边框 */
background-color: #FFFFFF;
selection-background-color: #8DD0D9; /* 选中项背景色 */
selection-color: #3E3E6E; /* 选中项文字颜色 */
}
/* ########## 其他元素 ########## */
/* 底部左侧的 "关于" 和 "调试" 按钮 */
#debugButton, #aboutButton {
/* 1. 完全透明化按钮本身及其内容 */
opacity: 0;
/* 2. 移除其占据的布局空间 */
width: 0px;
height: 0px;
padding: 0px;
margin: 0px;
/* 3. 确保其他视觉元素也被隐藏或不显示 */
background-color: transparent; /* 保持背景透明 */
color: transparent; /* 确保任何文本或可着色元素都透明 */
border: none; /* 移除边框 */
font-size: 0px; /* 字体大小设为0确保不占空间 */
/* 4. 显式地尝试移除图标(虽然 opacity: 0 应该已经足够,但这是更保险的做法) */
qproperty-icon: url(); /* 设置为空URL移除图标文件 */
qproperty-icon-size: 0px 0px; /* 将图标尺寸设置为0 */
}
/* 鼠标悬停时也保持完全隐藏状态 */
#debugButton:hover, #aboutButton:hover {
opacity: 0; /* 悬停时也完全透明 */
color: transparent; /* 悬停时文字颜色也保持透明 */
}
/* 进度条 (如果有的话) */
QProgressBar {
border: 1px solid #CCCCCC;
border-radius: 5px;
text-align: center;
background-color: #8DD0D9; /* 进度条背景可以稍暗的黄色 */
}
QProgressBar::chunk {
background-color: #F7B060; /* 进度条填充色为浅蓝/青 */
border-radius: 5px;
}
/* 复选框 */
QCheckBox {
color: #3E3E6E;
background-color: transparent;
}
QCheckBox::indicator:checked {
background-color: #8DD0D9; /* 选中时背景色 */
border: 1px solid #8DD0D9;
}
QCheckBox::indicator:unchecked {
background-color: #FFFFFF;
border: 1px solid #CCCCCC;
}
/* 标题 */
QHeaderView::section {
font : bold 16px "Noto Sans CJK SC", "Microsoft YaHei", sans-serif;
background-color: #F7B060; /* 表格头背景可以稍暗的黄色 */
color: #3E3E6E; /* 表格头文字颜色 */
padding: 5px;
}
/* 树形视图 */
QTreeView {
font: 16px "Noto Sans CJK SC", "Microsoft YaHei", sans-serif;
show-decoration-selected: 0;
background-color: #FFFFFF; /* 树形视图背景用白色,提高可读性 */
border: 1px solid #CCCCCC;
}
QTreeView::item {
padding: 2px;
background-color: transparent;
}
QTreeView::item:selected {
background-color: #8DD0D9;
color: #3E3E6E;
}
QTreeView::item:hover {
background-color: #E0F2F5; /* 浅色悬停背景 */
}

View File

@@ -210,7 +210,7 @@ operations:
- boost-libs
- ckbcomp
- calamares
- bbt-calamares-config
- tms-calamares-config
- hwinfo
- qt5-xmlpatterns
- squashfs-tools

View File

@@ -13,4 +13,6 @@ script:
- "- /bin/bash ${ROOT}/home/smart/smart-organizer-service-install.sh"
- "- rm -rf ${ROOT}/media/cinema/.*"
- "- rm -rf ${ROOT}/media/kdm/.*"
- "- systemctl enable smarttms.service"
- "- systemctl enable mysqld.service"
- "- systemctl enable todeskd.service"

View File

@@ -84,9 +84,8 @@ script:
- "-rm ${ROOT}/root/.zlogin"
- "-rm ${ROOT}/etc/polkit-1/rules.d/49-nopasswd_global.rules"
- "-rm ${ROOT}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules"
- "-rm ${ROOT}/usr/local/bin/alci-make-a-pure-arch"
- command: "/usr/local/bin/alci-displaymanager-check"
- command: "/usr/local/bin/alci-virtual-machine-check"
- "-rm ${ROOT}/usr/local/bin/alci-displaymanager-check"
- "-rm ${ROOT}/usr/local/bin/alci-virtual-machine-check"
- "-rm ${ROOT}/etc/systemd/system/multi-user.target.wants/sshd.service"
- "-rm ${ROOT}/etc/systemd/system/multi-user.target.wants/sshd.service"

View File

@@ -205,7 +205,7 @@ user:
hostname:
location: EtcFile
writeHostsFile: true
#template: "alci-${cpu}"
#template: "bbttms-${cpu}"
forbidden_names: [ localhost ]
presets:

29
up+.sh
View File

@@ -1,34 +1,5 @@
#!/bin/bash
#set -e
##################################################################################################################
# Author : Erik Dubois
# Website : https://www.erikdubois.be
# Website : https://www.alci.online
# Website : https://www.ariser.eu
# Website : https://www.arcolinux.info
# Website : https://www.arcolinux.com
# Website : https://www.arcolinuxd.com
# Website : https://www.arcolinuxb.com
# Website : https://www.arcolinuxiso.com
# Website : https://www.arcolinuxforum.com
##################################################################################################################
#
# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK.
#
##################################################################################################################
#tput setaf 0 = black
#tput setaf 1 = red
#tput setaf 2 = green
#tput setaf 3 = yellow
#tput setaf 4 = dark blue
#tput setaf 5 = purple
#tput setaf 6 = cyan
#tput setaf 7 = gray
#tput setaf 8 = light blue
##################################################################################################################
# reset - commit your changes or stash them before you merge
# git reset --hard - personal alias - grh
echo "Deleting the work folder if one exists"
[ -d work ] && rm -rf work