From 54c340d375ebff3fa90041e468bbee772d51e80a Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 22 May 2023 18:14:21 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B2=20gla?= =?UTF-8?q?de?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- com.ublinux.ubl-settings-resourcequota.svg | 4957 +++++++++++++++++ source/CMakeLists.txt | 17 +- source/{view => }/ubl-cmake.in | 0 source/view/CMakeLists.txt | 0 source/view/ubl-settings-resourcequota.h | 1 + ...g => ubl-settings-resourcequota-banner.png | Bin ubl-settings-resourcequota.glade | 1865 ++++--- ubl-settings-resourcequota_ru.po | 3 - 8 files changed, 5906 insertions(+), 937 deletions(-) create mode 100644 com.ublinux.ubl-settings-resourcequota.svg rename source/{view => }/ubl-cmake.in (100%) delete mode 100644 source/view/CMakeLists.txt rename logo-background.png => ubl-settings-resourcequota-banner.png (100%) diff --git a/com.ublinux.ubl-settings-resourcequota.svg b/com.ublinux.ubl-settings-resourcequota.svg new file mode 100644 index 0000000..f636c26 --- /dev/null +++ b/com.ublinux.ubl-settings-resourcequota.svg @@ -0,0 +1,4957 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 1be2390..676f7f4 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.7) -project(ubl-settings-TEMPLATE) +project(ubl-settings-resourcequota) find_package(PkgConfig REQUIRED) @@ -8,6 +8,12 @@ include_directories(${GTK_INCLUDE_DIRS}) link_directories(${GTK_LIBRARY_DIRS}) add_definitions(${GTK_CFLAGS_OTHER}) + +pkg_check_modules(VTE REQUIRED vte-2.91) +include_directories(${VTE_INCLUDE_DIRS}) +link_directories(${VTE_LIBRARY_DIRS}) +add_definitions(${VTE_CFLAGS_OTHER}) + find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) option(WEBKIT_FOUND "No" OFF) @@ -30,15 +36,16 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection -g") set(SOURCE_FILES - view/ubl-settings-TEMPLATE.c - view/ubl-settings-TEMPLATE.h + view/ubl-settings-resourcequota.c + view/ubl-settings-resourcequota.h view/ubl-strings.h view/ubl-utils.h view/ubl-utils.c - view/ubl-cmake.h) + ubl-cmake.h) set(LIBRARIES ${GTK_LIBRARIES} + ${VTE_LIBRARIES} ${WEBKIT_LIBRARIES} pthread) @@ -46,4 +53,4 @@ set(LIBRARIES add_executable(${PROJECT_NAME} ${SOURCE_FILES}) target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARIES}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR}) -install(TARGETS ubl-settings-TEMPLATE DESTINATION bin) \ No newline at end of file +install(TARGETS ubl-settings-resourcequota DESTINATION bin) \ No newline at end of file diff --git a/source/view/ubl-cmake.in b/source/ubl-cmake.in similarity index 100% rename from source/view/ubl-cmake.in rename to source/ubl-cmake.in diff --git a/source/view/CMakeLists.txt b/source/view/CMakeLists.txt deleted file mode 100644 index e69de29..0000000 diff --git a/source/view/ubl-settings-resourcequota.h b/source/view/ubl-settings-resourcequota.h index b390d8f..60db6c0 100644 --- a/source/view/ubl-settings-resourcequota.h +++ b/source/view/ubl-settings-resourcequota.h @@ -8,6 +8,7 @@ #include #include #include +#include #include "ubl-cmake.h" #ifdef WEBKIT_FOUND #include diff --git a/logo-background.png b/ubl-settings-resourcequota-banner.png similarity index 100% rename from logo-background.png rename to ubl-settings-resourcequota-banner.png diff --git a/ubl-settings-resourcequota.glade b/ubl-settings-resourcequota.glade index 0d7645a..7f6812a 100644 --- a/ubl-settings-resourcequota.glade +++ b/ubl-settings-resourcequota.glade @@ -3,47 +3,40 @@ - + False False True center - com.ublinux.ubl-settings-resourcequota + com.ublinux.ubl-settings-TEMPLATE dialog True - ubl-settings-resourcequota - 1.0 + ubl-settings-TEMPLATE + 1.1 Copyright © 2022 - 2023, UBSoft LLC - Setting user quotas - https://ublinux.ru/ + TEMPLATE + https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-TEMPLATE Project Home Page Это приложение распространяется без каких-либо гарантий. Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. UBGroup UBGroup - com.ublinux.ubl-settings-resourcequota + com.ublinux.ubl-settings-TEMPLATE True gpl-2-0 - True False - vertical - 2 False - end False False - 1 + 0 - - - @@ -59,7 +52,7 @@ 5 5 2 - ubl-settings-resourcequota + TEMPLATE @@ -68,7 +61,7 @@ - + True False @@ -80,10 +73,10 @@ 5 5 5 - 5 - 5 + 6 + 6 69 - com.ublinux.ubl-settings-resourcequota + com.ublinux.ubl-settings-TEMPLATE False @@ -109,7 +102,9 @@ 255 True False + end CPU and RAM quotas + 0 @@ -124,6 +119,28 @@ 0 + + + 255 + True + False + start + TEMPLATE + 0 + + + + + + + + True + True + 1 + + False @@ -146,7 +163,209 @@ - + + True + False + process-stop-symbolic + + + True + False + emblem-ok-symbolic + + + False + False + 450 + dialog-question-symbolic + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + vertical + 10 + + + True + False + + + True + False + start + 20 + 20 + dialog-question-symbolic + 6 + + + False + True + 0 + + + + + True + False + vertical + + + True + False + start + 10 + 5 + Would you like to read documentation in the Web? + True + 0 + + + + + + + False + True + 0 + + + + + True + False + start + start + 10 + 10 + You will be redirected to documentation website where documentation is +translated and supported by community. + True + 0 + + + + False + True + 1 + + + + + Always redirect to online documentation + True + True + False + end + True + + + + False + True + end + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + 30 + True + + + Cancel + True + True + True + image8 + + + + True + True + 0 + + + + + Read Online + True + True + True + image9 + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + True + False + + + True + False + UBLinux Settings + + + + + + + + + @@ -179,7 +398,7 @@ - + True False + + + True + False + True + + - - 640 - 500 + + 800 + 600 False - center - com.ublinux.ubl-settings-resourcequota - center + 800 + 600 + com.ublinux.ubl-settings-TEMPLATE True False vertical - + True False vertical - + True False - + True False 5 @@ -275,7 +501,6 @@ 5 5 25 - 1 False @@ -284,7 +509,7 @@ - + True False start @@ -292,15 +517,15 @@ 5 5 5 - 5 - 5 + 6 + 6 - True + False True 1 @@ -347,7 +572,7 @@ - + True False 5 @@ -360,588 +585,629 @@ True vertical - + True - True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + True + vertical - + True - False - vertical + True - + True - True - in + False + vertical - + True - False + True + in - + True - True - liststore1 - - - + False - - Type quota - True + + True + True + liststore + 0 + + + - - - 0 - + + Type quota + True + + + + 0 + + + - - - - - Quota volume - True - - - 1 - + + Quota volume + True + + + + 1 + + + - - - - - Soft RAM limit, (volume) - True - - - 2 - + + Soft RAM limit, (volume) + True + + + + 2 + + + - - - - - Hard RAM limit, (volume) - True - - - 3 - + + Hard RAM limit, (volume) + True + + + + 3 + + + - - - - - Swap file limit (volume) - True - - - 4 - + + Swap file limit (volume) + True + + + + 4 + + + - - - - - CPU limit (%) - True - - - 5 - + + CPU limit (%) + True + + + + 5 + + + - - - - - I/O limit (read) - True - - - 6 - + + I/O limit (read) + True + + + + 6 + + + - - - - - I/O limit (write) - True - - - 7 - + + I/O limit (write) + True + + + + 7 + + + + + True + True + 0 + - - - True - True - 0 - - - - - True - False - + True - True - True - 5 - 5 - 5 - 5 - 5 - 5 + False - + True - False - - - True - False - com.ublinux.ubl-settings-resourcequota.funnel - - - False - True - 0 - - + True + True + 5 + 5 + 5 + 5 + 5 + 5 - + True False - 5 - 5 - 5 - 5 - Filters + + + True + False + com.ublinux.ubl-settings-resourcequota.funnel + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Filters + + + False + True + 1 + + - - False - True - 1 - + + False + True + 0 + - - - False - True - 0 - - - - - - - - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - + + + + True - False + True + True + 5 + 5 + 5 + 5 + 5 + 5 - + True False - tab-new-symbolic + + + True + False + tab-new-symbolic + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Add + + + False + True + 1 + + - - False - True - 0 - + + + False + True + end + 2 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 - + True False - 5 - 5 - 5 - 5 - Add + + + True + False + error-correct-symbolic + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Edit + + + False + True + 1 + + - - False - True - 1 - + + False + True + end + 3 + - - - False - True - end - 2 - - - - - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - + True - False + True + True + 5 + 5 + 5 + 5 + 5 + 5 - + True False - error-correct-symbolic + + + True + False + software-remove-symbolic + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Remove + + + False + True + 1 + + - - False - True - 0 - + + + False + True + end + 4 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 - + True False - 5 - 5 - 5 - 5 - Edit + + + True + False + ibus-panel + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Information + + + False + True + 1 + + - - False - True - 1 - + + False + True + end + 5 + False True - end - 3 + 2 + + + + + True + False + List quotas + + + False + + + + + True + False + vertical - + True - True - True - 5 - 5 - 5 - 5 - 5 - 5 + False - + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Update every + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + False + True + 1 + + + + True False + 5 + 5 + 5 + 5 + 5 + 5 + seconds + + + False + True + 2 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 True False - software-remove-symbolic - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Remove - - - False - True - 1 - + + True + True + 3 + False True - end - 4 + 0 - + True True - True - 5 - 5 - 5 - 5 - 5 - 5 + in - + True False - - True - False - ibus-panel - - - False - True - 0 - - - - + True - False - 5 - 5 - 5 - 5 - Information + True + natural + natural + UTF-8 + True + False - - False - True - 1 - - False + True True - end - 5 + 1 - False - True - 2 + 1 - - - - - True - False - List quotas - - - False - - - - - True - False - vertical - - + + True False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Update every - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - False - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - seconds - - - False - True - 2 - - - - - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - - - True - True - 3 - - + Dispatcher - False - True - 0 + 1 + False - + True - True - in + False + vertical - + True False - + + All groups including empty True True - natural - natural - UTF-8 - True - False + False + 5 + 5 + 5 + 5 + 5 + 5 + True + + False + True + 0 + + + + + Core streams + True + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + 1 + - - - - - True - True - 1 - - - - - 1 - - - - - True - False - Dispatcher - - - 1 - False - - - - - True - False - vertical - - - True - False - - - All groups including empty - True - True - False - 5 - 5 - 5 - 5 - 5 - 5 - True False @@ -950,97 +1216,111 @@ - - Core streams + True True - False - 5 - 5 - 5 - 5 - 5 - 5 - True + in + + + True + False + + + True + True + natural + natural + UTF-8 + True + False + + + + - False + True True 1 - False - True - 0 + 2 - - + + True - True - in - - - True - False - - - True - True - natural - natural - UTF-8 - True - False - - - - + False + Processes - True - True - 1 + 2 + False - - - 2 - - - - - True - False - Processes - - - 2 - False - - - - - True - False - vertical True False + vertical - + True False - 5 - 5 - 5 - 5 - 5 - 5 - View properties for + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + View properties for + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + + + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + + + False + True + 2 + + False @@ -1049,94 +1329,60 @@ - + True - False - 5 - 5 - 5 - 5 - 5 - 5 + True + in + + + True + False + + + True + True + natural + natural + UTF-8 + True + False + + + + - False + True True 1 - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - - - False - True - 2 - - - False - True - 0 + 3 - - + + True - True - in - - - True - False - - - True - True - natural - natural - UTF-8 - True - False - - - - + False + Information - True - True - 1 + 3 + False - 3 - - - - - True - False - Information - - - 3 - False + True + True + 0 - True + False True 0 @@ -1161,6 +1407,7 @@ True False + True True @@ -1170,7 +1417,7 @@ 5 5 2 - ubl-settings-resourcequota + TEMPLATE @@ -1184,32 +1431,32 @@ 5 5 5 - 5 - 5 + 6 + 6 32 - com.ublinux.ubl-settings-resourcequota + com.ublinux.ubl-settings-TEMPLATE - + True False - + True True False True - menuLoad + menuSave True False - + True False - Load + Save False @@ -1238,34 +1485,55 @@ 0 - + + + True + True + True + False + True + True + menuAbout + none + + + + + + + False + True + 1 + + - 2 + end + 1 - + True False - + True True False True - menuSave + menuLoad True False - + True False - Save + Load False @@ -1294,37 +1562,9 @@ 0 - - - True - True - True - False - True - True - menuAbout - none - - - True - False - open-menu-symbolic - - - - - False - True - 1 - - - - - end - 3 + + 2 - - - False - True - 0 - - - - - True - False - start - start - 10 - 10 - You will be redirected to documentation website where documentation is -translated and supported by community. - True - 0 - - - - True - True - 1 - - - - - Always redirect to online documentation - True - True - False - end - 10 - True - - - - False - True - 2 - - - - - - True - True - 1 - - - - - - True - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 30 - True - - - Cancel - True - True - True - - - - True - True - 0 - - - - - Read Online - True - True - True - - - - True - True - 1 - - - - - False - True - 1 - - - - - - - True - False - - + True False - ubl-settings-resourcequota + Settings quotas - Editing - - - True - False - 32 - dialog-question-symbolic - - - - - - - 800 - 600 - False - True - True - com.ublinux.ubl-settings-resourcequota - - - - - - True - False - - - True - False - ubl-settings-resourcequota - - True diff --git a/ubl-settings-resourcequota_ru.po b/ubl-settings-resourcequota_ru.po index ff53e02..677d687 100644 --- a/ubl-settings-resourcequota_ru.po +++ b/ubl-settings-resourcequota_ru.po @@ -89,9 +89,6 @@ msgstr "Установка ресурсов квот" msgid "CPU and RAM quotas" msgstr "Квоты процессора и ОЗУ" -msgid "Information" -msgstr "Информация" - msgid "Delete" msgstr "Удалить"