reorganized catalog and added simple DBus-reading backend
This commit is contained in:
Yuri Kozyrev
parent
d934986868
commit
b84d59d60c
73
AlteratorBack/AlteratorDistInfo/.gitignore
vendored
73
AlteratorBack/AlteratorDistInfo/.gitignore
vendored
@ -1,73 +0,0 @@
|
||||
# This file is used to ignore files which are generated
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
*~
|
||||
*.autosave
|
||||
*.a
|
||||
*.core
|
||||
*.moc
|
||||
*.o
|
||||
*.obj
|
||||
*.orig
|
||||
*.rej
|
||||
*.so
|
||||
*.so.*
|
||||
*_pch.h.cpp
|
||||
*_resource.rc
|
||||
*.qm
|
||||
.#*
|
||||
*.*#
|
||||
core
|
||||
!core/
|
||||
tags
|
||||
.DS_Store
|
||||
.directory
|
||||
*.debug
|
||||
Makefile*
|
||||
*.prl
|
||||
*.app
|
||||
moc_*.cpp
|
||||
ui_*.h
|
||||
qrc_*.cpp
|
||||
Thumbs.db
|
||||
*.res
|
||||
*.rc
|
||||
/.qmake.cache
|
||||
/.qmake.stash
|
||||
|
||||
# qtcreator generated files
|
||||
*.pro.user*
|
||||
|
||||
# xemacs temporary files
|
||||
*.flc
|
||||
|
||||
# Vim temporary files
|
||||
.*.swp
|
||||
|
||||
# Visual Studio generated files
|
||||
*.ib_pdb_index
|
||||
*.idb
|
||||
*.ilk
|
||||
*.pdb
|
||||
*.sln
|
||||
*.suo
|
||||
*.vcproj
|
||||
*vcproj.*.*.user
|
||||
*.ncb
|
||||
*.sdf
|
||||
*.opensdf
|
||||
*.vcxproj
|
||||
*vcxproj.*
|
||||
|
||||
# MinGW generated files
|
||||
*.Debug
|
||||
*.Release
|
||||
|
||||
# Python byte code
|
||||
*.pyc
|
||||
|
||||
# Binaries
|
||||
# --------
|
||||
*.dll
|
||||
*.exe
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
project(AlteratorDistInfo LANGUAGES CXX)
|
||||
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus REQUIRED)
|
||||
|
||||
add_executable(AlteratorDistInfo
|
||||
main.cpp
|
||||
alteratordistinfo.h
|
||||
alteratordistinfo.cpp
|
||||
)
|
||||
target_link_libraries(AlteratorDistInfo Qt${QT_VERSION_MAJOR}::Core)
|
||||
target_link_libraries(AlteratorDistInfo Qt${QT_VERSION_MAJOR}::DBus)
|
||||
@ -1,11 +0,0 @@
|
||||
#include <QCoreApplication>
|
||||
#include "alteratordistinfo.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QCoreApplication a(argc, argv);
|
||||
|
||||
AlteratorDistInfo b = AlteratorDistInfo(&a);
|
||||
|
||||
return a.exec();
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
project(AlteratorBack LANGUAGES CXX)
|
||||
|
||||
add_subdirectory(AlteratorDistInfo)
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
<svg id="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="474.9536178107607" viewBox="0, 0, 400,474.9536178107607"><g id="svgg"><path id="path0" d="M189.610 4.225 C 156.978 20.878,122.160 34.942,93.878 42.896 C 75.909 47.949,56.585 51.706,13.605 58.501 C 4.405 59.956,2.298 60.363,0.867 60.961 L 0.000 61.323 0.001 71.045 C 0.004 87.781,2.560 143.890,4.462 168.955 C 6.132 190.957,6.676 195.961,8.321 204.453 C 15.727 242.669,24.282 271.419,37.654 303.030 C 50.003 332.224,78.065 375.428,100.316 399.505 C 107.044 406.785,118.626 418.338,122.820 421.951 C 136.586 433.812,153.582 448.013,159.060 452.230 C 161.996 454.491,164.001 455.793,170.810 459.864 C 174.075 461.816,178.417 464.494,180.458 465.814 C 186.778 469.904,197.388 474.954,199.659 474.954 C 201.596 474.954,214.266 468.998,219.419 465.666 C 220.711 464.830,225.220 462.057,229.437 459.502 C 240.528 452.786,246.003 448.564,266.172 431.174 C 270.049 427.830,274.780 423.763,276.685 422.134 C 284.045 415.841,304.176 394.836,310.106 387.260 C 322.113 371.921,332.345 357.150,341.377 342.115 C 357.859 314.678,365.340 298.473,375.918 267.285 C 382.661 247.408,391.241 210.109,393.560 190.600 C 396.046 169.677,399.647 100.548,399.822 70.390 L 399.876 61.002 398.887 60.794 C 392.150 59.378,378.991 57.027,369.450 55.536 C 325.914 48.731,307.235 44.148,273.346 31.954 C 259.134 26.841,232.006 14.833,211.566 4.609 L 202.353 0.000 200.063 0.030 L 197.774 0.060 189.610 4.225 M210.771 23.629 C 231.509 34.002,256.313 44.840,272.480 50.594 C 300.708 60.641,318.915 64.987,358.936 71.232 C 367.136 72.512,375.430 73.995,383.395 75.607 L 385.466 76.026 385.301 83.715 C 384.638 114.720,382.303 163.204,380.440 184.663 C 378.906 202.334,376.727 214.506,370.715 239.001 C 359.291 285.545,342.224 322.258,313.593 361.876 C 301.021 379.272,294.564 386.773,278.629 402.492 C 271.742 409.285,252.337 425.953,239.456 436.141 C 236.263 438.666,235.279 439.311,226.592 444.580 C 222.443 447.097,218.170 449.729,217.097 450.430 C 213.962 452.476,202.695 457.740,200.786 458.049 C 198.875 458.360,189.506 453.999,182.965 449.756 C 180.906 448.420,177.273 446.177,174.892 444.772 C 166.549 439.848,164.672 438.516,155.642 431.114 C 151.170 427.448,133.500 412.523,129.375 408.929 C 124.958 405.079,114.624 394.635,106.221 385.529 C 96.847 375.369,81.791 354.606,71.781 338.033 C 66.210 328.810,65.186 327.073,61.789 321.088 C 47.509 295.933,34.591 259.201,26.381 220.408 C 22.546 202.287,22.526 202.161,21.401 188.868 C 19.636 168.007,19.116 159.542,17.574 126.531 C 16.400 101.412,16.249 96.900,16.225 86.211 L 16.203 76.071 17.184 75.748 C 18.282 75.388,21.755 74.778,32.282 73.098 C 78.358 65.745,91.860 62.872,115.328 55.426 C 137.323 48.447,163.587 37.448,189.858 24.213 L 199.011 19.602 200.805 19.572 L 202.600 19.542 210.771 23.629 M188.868 36.714 C 155.488 53.615,126.279 65.076,99.938 71.609 C 85.608 75.163,77.636 76.672,45.055 81.999 C 30.860 84.320,30.222 84.440,28.979 85.030 L 28.126 85.435 28.296 94.851 C 28.643 114.075,30.744 159.417,32.165 178.355 C 33.880 201.206,34.170 203.574,36.859 216.735 C 39.649 230.382,40.237 232.899,43.819 246.506 C 50.879 273.326,60.916 299.102,71.850 318.491 C 94.425 358.525,113.212 381.965,143.774 408.230 C 163.297 425.008,166.361 427.426,173.849 431.963 C 176.609 433.635,180.643 436.148,182.814 437.548 C 189.965 442.161,198.841 446.360,200.421 445.879 C 203.336 444.992,213.515 440.068,216.327 438.185 C 217.551 437.364,221.336 434.989,224.737 432.905 C 228.139 430.822,231.422 428.782,232.035 428.372 C 236.378 425.463,249.922 414.090,267.296 398.759 C 269.985 396.386,278.584 387.619,284.882 380.829 C 299.071 365.532,313.215 345.237,328.670 317.996 C 336.191 304.742,342.866 289.346,349.908 269.017 C 356.795 249.137,364.358 216.557,366.590 197.155 C 368.703 178.798,371.738 119.101,371.879 93.142 L 371.923 84.984 364.131 83.447 C 359.845 82.601,352.387 81.285,347.557 80.523 C 310.370 74.652,293.227 70.505,266.790 60.985 C 252.140 55.709,227.364 44.702,209.106 35.359 C 199.435 30.409,201.608 30.264,188.868 36.714 " stroke="none" fill="#000000" fill-rule="evenodd"></path></g></svg>
|
||||
|
Before Width: | Height: | Size: 4.0 KiB |
@ -1,12 +0,0 @@
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Window 2.15
|
||||
import QtQuick.Layouts 1.15
|
||||
import QtQuick.Controls 2.15
|
||||
import Qt.labs.qmlmodels 1.0
|
||||
|
||||
|
||||
AlteratorWindow{
|
||||
id: informationWindow
|
||||
|
||||
url: "DistInfo.qml"
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
project(alteratorDistInfo VERSION 0.1 LANGUAGES CXX)
|
||||
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick LinguistTools)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick LinguistTools)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS QuickWidgets)
|
||||
|
||||
set(TS_FILES alteratorDistInfo_ru_RU.ts)
|
||||
|
||||
set(PROJECT_SOURCES
|
||||
main.cpp
|
||||
qml.qrc
|
||||
${TS_FILES}
|
||||
)
|
||||
|
||||
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
|
||||
qt_add_executable(alteratorDistInfo
|
||||
MANUAL_FINALIZATION
|
||||
${PROJECT_SOURCES}
|
||||
)
|
||||
# Define target properties for Android with Qt 6 as:
|
||||
# set_property(TARGET alteratorDistInfo APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
|
||||
# ${CMAKE_CURRENT_SOURCE_DIR}/android)
|
||||
# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
|
||||
|
||||
qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
|
||||
else()
|
||||
if(ANDROID)
|
||||
add_library(alteratorDistInfo SHARED
|
||||
${PROJECT_SOURCES}
|
||||
)
|
||||
# Define properties for Android with Qt 5 after find_package() calls as:
|
||||
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
|
||||
else()
|
||||
add_executable(alteratorDistInfo
|
||||
${PROJECT_SOURCES}
|
||||
)
|
||||
endif()
|
||||
|
||||
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
|
||||
endif()
|
||||
|
||||
target_compile_definitions(alteratorDistInfo
|
||||
PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
|
||||
target_link_libraries(alteratorDistInfo
|
||||
PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick
|
||||
Qt${QT_VERSION_MAJOR}::QuickWidgets)
|
||||
|
||||
set_target_properties(alteratorDistInfo PROPERTIES
|
||||
MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
|
||||
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
|
||||
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
|
||||
MACOSX_BUNDLE TRUE
|
||||
WIN32_EXECUTABLE TRUE
|
||||
)
|
||||
|
||||
if(QT_VERSION_MAJOR EQUAL 6)
|
||||
qt_import_qml_plugins(alteratorDistInfo)
|
||||
qt_finalize_executable(alteratorDistInfo)
|
||||
endif()
|
||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 MiB |
@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.1" language="ru_RU">
|
||||
<context>
|
||||
<name>AlteratorToolBar</name>
|
||||
<message>
|
||||
<location filename="AlteratorToolBar.qml" line="18"/>
|
||||
<source>Назад</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="AlteratorToolBar.qml" line="27"/>
|
||||
<source>Вперед</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="AlteratorToolBar.qml" line="36"/>
|
||||
<source>Выше</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DistInfo</name>
|
||||
<message>
|
||||
<location filename="DistInfo.qml" line="25"/>
|
||||
<source>Alt Edition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
</TS>
|
||||
@ -1,35 +0,0 @@
|
||||
#include <QGuiApplication>
|
||||
#include <QQmlApplicationEngine>
|
||||
#include "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/alterator_loader.h"
|
||||
#include <QLocale>
|
||||
#include <QTranslator>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
#endif
|
||||
QGuiApplication app(argc, argv);
|
||||
|
||||
QTranslator translator;
|
||||
const QStringList uiLanguages = QLocale::system().uiLanguages();
|
||||
for (const QString &locale : uiLanguages) {
|
||||
const QString baseName = "alteratorDistInfo_" + QLocale(locale).name();
|
||||
if (translator.load(":/i18n/" + baseName)) {
|
||||
app.installTranslator(&translator);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
QQmlApplicationEngine engine;
|
||||
const QUrl url(QStringLiteral("../AlteratorDistInfo/DistInfo.qml"));
|
||||
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
|
||||
&app, [url](QObject *obj, const QUrl &objUrl) {
|
||||
if (!obj && url == objUrl)
|
||||
QCoreApplication::exit(-1);
|
||||
}, Qt::QueuedConnection);
|
||||
engine.load(url);
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
project(AlteratorFront LANGUAGES CXX)
|
||||
|
||||
add_subdirectory(AlteratorDistInfo)
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
project(alterator_loader LANGUAGES CXX)
|
||||
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core LinguistTools)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core LinguistTools)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS QuickWidgets)
|
||||
|
||||
set(TS_FILES untitled_ru_RU.ts)
|
||||
|
||||
add_executable(alterator_loader
|
||||
main.cpp
|
||||
alterator_loader.h alterator_loader.cpp
|
||||
${TS_FILES}
|
||||
)
|
||||
|
||||
target_link_libraries(alterator_loader Qt${QT_VERSION_MAJOR}::Core)
|
||||
target_link_libraries(alterator_loader Qt${QT_VERSION_MAJOR}::Gui)
|
||||
target_link_libraries(alterator_loader Qt${QT_VERSION_MAJOR}::QuickWidgets)
|
||||
|
||||
if(COMMAND qt_create_translation)
|
||||
qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
|
||||
else()
|
||||
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
|
||||
endif()
|
||||
@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE TS>
|
||||
<TS version="2.1" language="ru_RU">
|
||||
<context>
|
||||
<name>AlteratorToolBar</name>
|
||||
<message>
|
||||
<location filename="../AlteratorFront/AlteratorDistInfo/AlteratorToolBar.qml" line="18"/>
|
||||
<source>Назад</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../AlteratorFront/AlteratorDistInfo/AlteratorToolBar.qml" line="27"/>
|
||||
<source>Вперед</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../AlteratorFront/AlteratorDistInfo/AlteratorToolBar.qml" line="36"/>
|
||||
<source>Выше</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>DistInfo</name>
|
||||
<message>
|
||||
<location filename="../AlteratorFront/AlteratorDistInfo/DistInfo.qml" line="25"/>
|
||||
<source>Alt Edition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
</TS>
|
||||
@ -2,6 +2,49 @@ cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
project(new_alterator LANGUAGES CXX)
|
||||
|
||||
add_subdirectory(AlteratorLoader)
|
||||
add_subdirectory(AlteratorFront)
|
||||
add_subdirectory(AlteratorBack)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
set(CMAKE_AUTOUIC ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
|
||||
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick QuickWidgets DBus)
|
||||
|
||||
project(new_alterator
|
||||
LANGUAGES CXX
|
||||
VERSION 0.1
|
||||
DESCRIPTION "Front end of new alterator")
|
||||
|
||||
set(SOURCES
|
||||
${CMAKE_SOURCE_DIR}/src/alterator_loader.cpp
|
||||
${CMAKE_SOURCE_DIR}/src/dist_info.cpp
|
||||
${CMAKE_SOURCE_DIR}/src/src.qrc)
|
||||
|
||||
set(HEADERS
|
||||
${CMAKE_SOURCE_DIR}/include/alterator_loader.h
|
||||
${CMAKE_SOURCE_DIR}/include/dist_info.h)
|
||||
|
||||
set(RESOURCES
|
||||
${CMAKE_SOURCE_DIR}/resources/wiki_logo.svg)
|
||||
|
||||
set(SHARED
|
||||
${CMAKE_SOURCE_DIR}/shared/shared.qrc)
|
||||
|
||||
add_executable(new_alterator ${CMAKE_SOURCE_DIR}/src/main.cpp
|
||||
${SOURCES}
|
||||
${SHARED}
|
||||
${HEADERS})
|
||||
|
||||
#add_library(new_alterator_lib SHARED ${SHARED})
|
||||
|
||||
#target_link_libraries(new_alterator new_alterator_lib)
|
||||
|
||||
target_link_libraries(new_alterator
|
||||
Qt${QT_VERSION_MAJOR}::Core
|
||||
Qt${QT_VERSION_MAJOR}::Quick
|
||||
Qt${QT_VERSION_MAJOR}::QuickWidgets
|
||||
Qt${QT_VERSION_MAJOR}::DBus)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 7.0.2, 2022-07-05T18:40:36. -->
|
||||
<!-- Written by QtCreator 7.0.2, 2022-07-07T19:22:10. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
@ -70,6 +70,9 @@
|
||||
<valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
|
||||
<value type="int" key="AutoTest.RunAfterBuild">0</value>
|
||||
<value type="bool" key="AutoTest.UseGlobal">true</value>
|
||||
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
|
||||
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
|
||||
<value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.BuildSystem</value>
|
||||
<valuemap type="QVariantMap" key="ClangTools">
|
||||
<value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
|
||||
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
|
||||
@ -80,6 +83,9 @@
|
||||
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
|
||||
<value type="bool" key="ClangTools.UseGlobalSettings">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="CppEditor.QuickFix">
|
||||
<value type="bool" key="UseGlobalSettings">true</value>
|
||||
</valuemap>
|
||||
</valuemap>
|
||||
</data>
|
||||
<data>
|
||||
@ -101,7 +107,7 @@
|
||||
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
|
||||
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
|
||||
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorBack/build-AlteratorDistInfo-Desktop-Debug</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/SMB.BASEALT.RU/kozyrevid/work/build-new_alterator-Desktop-Debug</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
|
||||
@ -147,7 +153,7 @@
|
||||
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
|
||||
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
|
||||
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorBack/build-AlteratorDistInfo-Desktop-Release</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/SMB.BASEALT.RU/kozyrevid/work/build-new_alterator-Desktop-Release</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
|
||||
@ -191,7 +197,7 @@
|
||||
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
|
||||
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
|
||||
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorBack/build-AlteratorDistInfo-Desktop-RelWithDebInfo</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/SMB.BASEALT.RU/kozyrevid/work/build-new_alterator-Desktop-RelWithDebInfo</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
|
||||
@ -235,7 +241,7 @@
|
||||
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
|
||||
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
|
||||
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorBack/build-AlteratorDistInfo-Desktop-MinSizeRel</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/SMB.BASEALT.RU/kozyrevid/work/build-new_alterator-Desktop-MinSizeRel</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
|
||||
@ -291,15 +297,15 @@
|
||||
<valuelist type="QVariantList" key="CustomOutputParsers"/>
|
||||
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
|
||||
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">AlteratorDistInfo</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.AlteratorDistInfo</value>
|
||||
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">AlteratorDistInfo</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">new_alterator</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.new_alterator</value>
|
||||
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">new_alterator</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
||||
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorBack/build-AlteratorDistInfo-Desktop-Debug</value>
|
||||
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/SMB.BASEALT.RU/kozyrevid/work/build-new_alterator-Desktop-Debug</value>
|
||||
</valuemap>
|
||||
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
||||
</valuemap>
|
||||
42
README.md
42
README.md
@ -1,23 +1,23 @@
|
||||
# Отбор параметров для отображения в окне информации о системе
|
||||
Все данные были разбиты на 3 группы:
|
||||
* данные о версии ОС
|
||||
* данные об железе
|
||||
* данные об имени машины и домена
|
||||
Для первого раздела были отбраны следующие данные:
|
||||
* текущая(можно найти в hostnamectl, etc/os-release или на dbus в hostname1) и изначально установленная версия ОС(на данный момент не поятно где брать установленную версию)
|
||||
* дата последнего обновления системы (мне удалось найти timestamp в /var/.update, доступ туда есть из под пользователя)
|
||||
* версию ядра(данные о ядре можно найти на dbus в hostname1, но выглядят они так >KernelName: Linux KernelRelease: 5.10.82-std-def-alt1 KernelVersion: #1 SMP Fri Dec 3 14:49:25 UTC 2021).
|
||||
В данные о железе я включил:
|
||||
* производителя и название устройства(hostnamectl и hostname1)
|
||||
* возможно тип системы, но я не думаю что она имеет какой-то смыслпри наличии архитектуры процессора
|
||||
* данные о процессоре(название и архитектура; более детальные данные такие как частота и объём кэшей для каждого ядра, можно вынести в отдельное окно)
|
||||
* общий объём ОЗУ(частоты и объёмы каждоко модуля можно отправить в то же окно что и данные о процессоре)
|
||||
* название GPU(версию драйвера, объём видео-памяти и данные о шине, также можно разместить в другом окне).
|
||||
В последний раздел можно поместить():
|
||||
* hostname
|
||||
* realm
|
||||
* роль в домене
|
||||
* workgroup
|
||||
* также должна присутствовать кнопка пережода к натройкам домена.
|
||||
Отбор параметров для отображения в окне информации о системе
|
||||
|
||||
Все данные были разбиты на 3 группы:
|
||||
|
||||
данные о версии ОС
|
||||
данные об железе
|
||||
данные об имени машины и домена Для первого раздела были отбраны следующие данные:
|
||||
текущая(можно найти в hostnamectl, etc/os-release или на dbus в hostname1) и изначально установленная версия ОС(на данный момент не поятно где брать изначально установленную версию)
|
||||
дата последнего обновления системы (мне удалось найти timestamp в /var/.update, доступ туда есть из под пользователя)
|
||||
версию ядра(данные о ядре можно найти на dbus в hostname1, но выглядят они так >KernelName: Linux KernelRelease: 5.10.82-std-def-alt1 KernelVersion: #1 SMP Fri Dec 3 14:49:25 UTC 2021). В данные о железе я включил:
|
||||
производителя и название устройства(hostnamectl и hostname1)
|
||||
возможно тип системы, но я не думаю что она имеет какой-то смыслпри наличии архитектуры процессора
|
||||
данные о процессоре(название и архитектура; более детальные данные такие как частота и объём кэшей для каждого ядра, можно вынести в отдельное окно)
|
||||
общий объём ОЗУ(частоты и объёмы каждоко модуля можно отправить в то же окно что и данные о процессоре)
|
||||
название GPU(версию драйвера, объём видео-памяти и данные о шине, также можно разместить в другом окне). В последний раздел можно поместить():
|
||||
hostname
|
||||
realm
|
||||
роль в домене
|
||||
workgroup
|
||||
также должна присутствовать кнопка пережода к натройкам домена.
|
||||
|
||||
Внизу страницы предполагается разместить ссылки на https://basealt.ru/ и https://bugs.altlinux.org/
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ public slots:
|
||||
void forvard(QString senderId);
|
||||
|
||||
private:
|
||||
const QString windowUrl = "../../new_alterator/AlteratorFront/AlteratorDistInfo/AlteratorWindow.qml";
|
||||
const QString windowUrl = "../new_alterator/shared/AlteratorWindow.qml";
|
||||
|
||||
void open(QString targetUrl);
|
||||
|
||||
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
@ -34,7 +34,7 @@ ToolBar{
|
||||
id: upButton
|
||||
|
||||
text: qsTr("Выше")
|
||||
onClicked: moveReqS(windowId, "../../new_alterator/AlteratorDistInfo/Test.qml")
|
||||
onClicked: moveReqS(windowId, "../../new_alterator/src/Test.qml")
|
||||
height: toolBar.height
|
||||
width: 800
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
module TextWithHeader
|
||||
module shared
|
||||
TextWithHeader 1.0 TextWithHeader.qml
|
||||
@ -1,9 +1,7 @@
|
||||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file>AlteratorDistInfo.qml</file>
|
||||
<file>TextWithHeader.qml</file>
|
||||
<file>AlteratorToolBar.qml</file>
|
||||
<file>AlteratorWindow.qml</file>
|
||||
<file>DistInfo.qml</file>
|
||||
<file>Test.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
@ -2,7 +2,7 @@ import QtQuick 2.15
|
||||
import QtQuick.Window 2.15
|
||||
import QtQuick.Layouts 1.15
|
||||
import QtQuick.Controls 2.15
|
||||
import ru.basealt.TextWithHeader 1.0
|
||||
import shared 1.0
|
||||
|
||||
ColumnLayout{
|
||||
Rectangle{
|
||||
@ -22,7 +22,7 @@ ColumnLayout{
|
||||
TextArea{
|
||||
id: header
|
||||
|
||||
text: qsTr("Alt Edition")
|
||||
text: qsTr("ALT Edition")
|
||||
font.pointSize: 12
|
||||
}
|
||||
Rectangle{
|
||||
@ -52,7 +52,7 @@ ColumnLayout{
|
||||
Image {
|
||||
sourceSize.width: 100
|
||||
sourceSize.height: 100
|
||||
source: "wiki_logo.svg"
|
||||
source: "../resources/wiki_logo.svg"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -78,7 +78,7 @@ ColumnLayout{
|
||||
|
||||
headerS: "Computer name, domain..."
|
||||
keys: ["Processor", "RAM", "System Type"]
|
||||
vals: [getProcessor(),getRAM(), getSysType()]
|
||||
vals: [DistInfoBack.getOS(), getRAM(), getSysType()]
|
||||
n: 3
|
||||
|
||||
function getProcessor(){return "abc"}
|
||||
@ -1,5 +1,5 @@
|
||||
#include "alterator_loader.h"
|
||||
#include "../AlteratorBack/AlteratorDistInfo/alteratordistinfo.h"
|
||||
#include "../../new_alterator/include/alterator_loader.h"
|
||||
#include "../include/dist_info.h"
|
||||
#include <QQmlComponent>
|
||||
#include <QQmlApplicationEngine>
|
||||
#include <QQuickItem>
|
||||
@ -9,10 +9,10 @@
|
||||
AlteratorLoader::AlteratorLoader(QObject *p):QObject(p)
|
||||
{
|
||||
engine = new QQmlApplicationEngine(this);
|
||||
engine->addImportPath("../../new_alterator/");
|
||||
// AlteratorDistInfo back = AlteratorDistInfo(engine);
|
||||
// engine->rootContext()->setContextProperty("back", &back);
|
||||
QString startingPage = "../../../new_alterator/AlteratorFront/AlteratorDistInfo/DistInfo.qml";
|
||||
engine->addImportPath("../new_alterator/");
|
||||
AlteratorDistInfo DistInfo = AlteratorDistInfo(engine);
|
||||
engine->rootContext()->setContextProperty("DistInfoBack", &DistInfo);
|
||||
QString startingPage = "../../new_alterator/src/DistInfo.qml";
|
||||
past = QHash<QString, QVector<QString>>();
|
||||
future = QHash<QString, QVector<QString>>();
|
||||
widgets = QHash<QString, QObject*>();
|
||||
@ -1,4 +1,4 @@
|
||||
#include "alteratordistinfo.h"
|
||||
#include "../include/dist_info.h"
|
||||
|
||||
AlteratorDistInfo::AlteratorDistInfo(QObject *parent): QObject(parent)
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
#include <QApplication>
|
||||
#include <QLocale>
|
||||
#include <QTranslator>
|
||||
#include "alterator_loader.h"
|
||||
#include "../../new_alterator/include/alterator_loader.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
6
src/src.qrc
Normal file
6
src/src.qrc
Normal file
@ -0,0 +1,6 @@
|
||||
<RCC>
|
||||
<qresource prefix="/">
|
||||
<file>DistInfo.qml</file>
|
||||
<file>Test.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
Loading…
x
Reference in New Issue
Block a user