Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove NUMA and gconfig/menuconfig settings #42

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions config-option-lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ mod ffi {

pub cachy_config_check: bool,
pub nconfig_check: bool,
pub menuconfig_check: bool,
pub xconfig_check: bool,
pub gconfig_check: bool,
pub localmodcfg_check: bool,
pub numa_check: bool,
pub damon_check: bool,
pub builtin_zfs_check: bool,
pub builtin_nvidia_check: bool,
Expand Down
10 changes: 0 additions & 10 deletions lang/cachyos-kernel-manager_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,11 @@
<source>Tweak kernel options prior to a build via nconfig</source>
<translation>Upravit možnosti jádra před sestavením přes nconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="124"/>
<source>Tweak kernel options prior to a build via menuconfig</source>
<translation>Upravit možnosti jádra před sestavením přes menuconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="153"/>
<source>Tweak kernel options prior to a build via xconfig</source>
<translation>Upravit možnosti jádra před sestavením přes xconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="182"/>
<source>Tweak kernel options prior to a build via gconfig</source>
<translation>Upravit možnosti jádra před sestavením přes gconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="211"/>
<source>Disable NUMA</source>
Expand Down
15 changes: 0 additions & 15 deletions lang/cachyos-kernel-manager_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,11 @@
<source>Tweak kernel options prior to a build via nconfig</source>
<translation>Kernel-Optionen vor einem Build über nconfig anpassen</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="124"/>
<source>Tweak kernel options prior to a build via menuconfig</source>
<translation>Kernel-Optionen vor einem Build über menuconfig anpassen</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="153"/>
<source>Tweak kernel options prior to a build via xconfig</source>
<translation>Kernel-Optionen vor einem Build über xconfig anpassen</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="182"/>
<source>Tweak kernel options prior to a build via gconfig</source>
<translation>Kernel-Optionen vor einem Build über gconfig anpassen</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="211"/>
<source>Disable NUMA</source>
<translation>NUMA deaktivieren</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="240"/>
<source>Use Modprobed-db</source>
Expand Down
15 changes: 0 additions & 15 deletions lang/cachyos-kernel-manager_pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,11 @@
<source>Tweak kernel options prior to a build via nconfig</source>
<translation>Dostosuj opcje budowania kernela za pomocą nconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="124"/>
<source>Tweak kernel options prior to a build via menuconfig</source>
<translation>Dostosuj opcje budowania kernela za pomocą menuconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="153"/>
<source>Tweak kernel options prior to a build via xconfig</source>
<translation>Dostosuj opcje budowania kernela za pomocą xconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="182"/>
<source>Tweak kernel options prior to a build via gconfig</source>
<translation>Dostosuj opcje budowania kernela za pomocą gconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="211"/>
<source>Disable NUMA</source>
<translation>Wyłącz NUMA</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="240"/>
<source>Use Modprobed-db</source>
Expand Down
10 changes: 0 additions & 10 deletions lang/cachyos-kernel-manager_ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,11 @@
<source>Tweak kernel options prior to a build via nconfig</source>
<translation>Выполнить настройку параметров ядра с помощью nconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="124"/>
<source>Tweak kernel options prior to a build via menuconfig</source>
<translation>Выполнить настройку параметров ядра с помощью menuconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="153"/>
<source>Tweak kernel options prior to a build via xconfig</source>
<translation>Выполнить настройку параметров ядра с помощью xconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="182"/>
<source>Tweak kernel options prior to a build via gconfig</source>
<translation>Выполнить настройку параметров ядра с помощью gconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="211"/>
<source>Disable NUMA</source>
Expand Down
15 changes: 0 additions & 15 deletions lang/cachyos-kernel-manager_sk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,11 @@
<source>Tweak kernel options prior to a build via nconfig</source>
<translation>Upraviť možnosti jadra pred zostavením cez nconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="124"/>
<source>Tweak kernel options prior to a build via menuconfig</source>
<translation>Upraviť možnosti jadra pred zostavením cez menuconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="153"/>
<source>Tweak kernel options prior to a build via xconfig</source>
<translation>Upraviť možnosti jadra pred zostavením cez xconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="182"/>
<source>Tweak kernel options prior to a build via gconfig</source>
<translation>Upraviť možnosti jadra pred zostavením cez gconfig</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="211"/>
<source>Disable NUMA</source>
<translation>Zakázať NUMA</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="240"/>
<source>Use Modprobed-db</source>
Expand Down
10 changes: 0 additions & 10 deletions lang/cachyos-kernel-manager_tr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,11 @@
<source>Tweak kernel options prior to a build via nconfig</source>
<translation>nconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="124"/>
<source>Tweak kernel options prior to a build via menuconfig</source>
<translation>menuconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="153"/>
<source>Tweak kernel options prior to a build via xconfig</source>
<translation>xconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="182"/>
<source>Tweak kernel options prior to a build via gconfig</source>
<translation>gconfig ile yapılandırmadan önce çekirdek ayarlarına ince ayar yap</translation>
</message>
<message>
<location filename="../src/conf-options-page.ui" line="211"/>
<source>Disable NUMA</source>
Expand Down
3 changes: 0 additions & 3 deletions src/compile_options.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
"option_map": {
"cachy_config": "_cachy_config",
"nconfig": "_makenconfig",
"menuconfig": "_makemenuconfig",
"xconfig": "_makexconfig",
"gconfig": "_makegconfig",
"numa": "_NUMAdisable",
"localmodcfg": "_localmodcfg",
"hardly": "_cc_harder",
"per_gov": "_per_gov",
Expand Down
87 changes: 0 additions & 87 deletions src/conf-options-page.ui
Original file line number Diff line number Diff line change
Expand Up @@ -115,35 +115,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="menuconfig_widget" native="true">
<layout class="QHBoxLayout" name="menuconfig_horizontal_layout">
<item>
<widget class="QLabel" name="menuconfig_label">
<property name="text">
<string>Tweak kernel options prior to a build via menuconfig</string>
</property>
</widget>
</item>
<item>
<spacer name="menuconfig_horizontal_spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="menuconfig_check"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="xconfig_widget" native="true">
<layout class="QHBoxLayout" name="xconfig_horizontal_layout">
Expand Down Expand Up @@ -173,64 +144,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="gconfig_widget" native="true">
<layout class="QHBoxLayout" name="gconfig_horizontal_layout">
<item>
<widget class="QLabel" name="gconfig_label">
<property name="text">
<string>Tweak kernel options prior to a build via gconfig</string>
</property>
</widget>
</item>
<item>
<spacer name="gconfig_horizontal_spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="gconfig_check"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="numa_widget" native="true">
<layout class="QHBoxLayout" name="numa_horizontal_layout">
<item>
<widget class="QLabel" name="numa_label">
<property name="text">
<string>Disable NUMA</string>
</property>
</widget>
</item>
<item>
<spacer name="numa_horizontal_spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="numa_check"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="localmodcfg_widget" native="true">
<layout class="QHBoxLayout" name="localmodcfg_horizontal_layout">
Expand Down
9 changes: 0 additions & 9 deletions src/conf-window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,8 @@ std::string ConfWindow::get_all_set_values() const noexcept {

result += convert_to_var_assign_empty_wrapped("cachy_config", checkstate_checked(options_page_ui_obj->cachyconfig_check));
result += convert_to_var_assign_empty_wrapped("nconfig", checkstate_checked(options_page_ui_obj->nconfig_check));
result += convert_to_var_assign_empty_wrapped("menuconfig", checkstate_checked(options_page_ui_obj->menuconfig_check));
result += convert_to_var_assign_empty_wrapped("xconfig", checkstate_checked(options_page_ui_obj->xconfig_check));
result += convert_to_var_assign_empty_wrapped("gconfig", checkstate_checked(options_page_ui_obj->gconfig_check));
result += convert_to_var_assign_empty_wrapped("localmodcfg", checkstate_checked(options_page_ui_obj->localmodcfg_check));
result += convert_to_var_assign_empty_wrapped("numa", checkstate_checked(options_page_ui_obj->numa_check));
result += convert_to_var_assign_empty_wrapped("damon", checkstate_checked(options_page_ui_obj->damon_check));
result += convert_to_var_assign_empty_wrapped("builtin_zfs", checkstate_checked(options_page_ui_obj->builtin_zfs_check));
result += convert_to_var_assign_empty_wrapped("builtin_nvidia", checkstate_checked(options_page_ui_obj->builtin_nvidia_check));
Expand Down Expand Up @@ -679,11 +676,8 @@ void ConfWindow::on_save() noexcept {

config_options.cachy_config_check = checkstate_checked(options_page_ui_obj->cachyconfig_check);
config_options.nconfig_check = checkstate_checked(options_page_ui_obj->nconfig_check);
config_options.menuconfig_check = checkstate_checked(options_page_ui_obj->menuconfig_check);
config_options.xconfig_check = checkstate_checked(options_page_ui_obj->xconfig_check);
config_options.gconfig_check = checkstate_checked(options_page_ui_obj->gconfig_check);
config_options.localmodcfg_check = checkstate_checked(options_page_ui_obj->localmodcfg_check);
config_options.numa_check = checkstate_checked(options_page_ui_obj->numa_check);
config_options.damon_check = checkstate_checked(options_page_ui_obj->damon_check);
config_options.builtin_zfs_check = checkstate_checked(options_page_ui_obj->builtin_zfs_check);
config_options.builtin_nvidia_check = checkstate_checked(options_page_ui_obj->builtin_nvidia_check);
Expand Down Expand Up @@ -743,11 +737,8 @@ void ConfWindow::on_load() noexcept {

set_checkstate(options_page_ui_obj->cachyconfig_check, config_options->cachy_config_check);
set_checkstate(options_page_ui_obj->nconfig_check, config_options->nconfig_check);
set_checkstate(options_page_ui_obj->menuconfig_check, config_options->menuconfig_check);
set_checkstate(options_page_ui_obj->xconfig_check, config_options->xconfig_check);
set_checkstate(options_page_ui_obj->gconfig_check, config_options->gconfig_check);
set_checkstate(options_page_ui_obj->localmodcfg_check, config_options->localmodcfg_check);
set_checkstate(options_page_ui_obj->numa_check, config_options->numa_check);
set_checkstate(options_page_ui_obj->damon_check, config_options->damon_check);
set_checkstate(options_page_ui_obj->builtin_zfs_check, config_options->builtin_zfs_check);
set_checkstate(options_page_ui_obj->builtin_nvidia_check, config_options->builtin_nvidia_check);
Expand Down
6 changes: 0 additions & 6 deletions src/config-options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,8 @@ auto ConfigOptions::parse_from_file(std::string_view filepath) noexcept -> std::

.cachy_config_check = rust_config_options.cachy_config_check,
.nconfig_check = rust_config_options.nconfig_check,
.menuconfig_check = rust_config_options.menuconfig_check,
.xconfig_check = rust_config_options.xconfig_check,
.gconfig_check = rust_config_options.gconfig_check,
.localmodcfg_check = rust_config_options.localmodcfg_check,
.numa_check = rust_config_options.numa_check,
.damon_check = rust_config_options.damon_check,
.builtin_zfs_check = rust_config_options.builtin_zfs_check,
.builtin_nvidia_check = rust_config_options.builtin_nvidia_check,
Expand Down Expand Up @@ -90,11 +87,8 @@ auto ConfigOptions::write_config_file(const ConfigOptions& config_options, std::

.cachy_config_check = config_options.cachy_config_check,
.nconfig_check = config_options.nconfig_check,
.menuconfig_check = config_options.menuconfig_check,
.xconfig_check = config_options.xconfig_check,
.gconfig_check = config_options.gconfig_check,
.localmodcfg_check = config_options.localmodcfg_check,
.numa_check = config_options.numa_check,
.damon_check = config_options.damon_check,
.builtin_zfs_check = config_options.builtin_zfs_check,
.builtin_nvidia_check = config_options.builtin_nvidia_check,
Expand Down
3 changes: 0 additions & 3 deletions src/config-options.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,8 @@ struct ConfigOptions {

bool cachy_config_check{};
bool nconfig_check{};
bool menuconfig_check{};
bool xconfig_check{};
bool gconfig_check{};
bool localmodcfg_check{};
bool numa_check{};
bool damon_check{};
bool builtin_zfs_check{};
bool builtin_nvidia_check{};
Expand Down
Loading