From 174fd8e31daa231550ce136125ea5bba789069d6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 8 Aug 2023 10:21:24 +0600 Subject: [PATCH 01/10] Small refactoring process --- .install.sh | 6 - Makefile | 48 +- ...ubl-settings-diskquota.funnel-symbolic.svg | 0 gdb.policy | 24 - source/controler.c | 1 + source/ubl-settings-diskquota.h | 2 +- ubl-settings-diskquota.glade | 6931 +++++++++-------- 7 files changed, 3588 insertions(+), 3424 deletions(-) delete mode 100755 .install.sh rename com.ublinux.ubl-settings-diskquota.funnel.svg => com.ublinux.ubl-settings-diskquota.funnel-symbolic.svg (100%) delete mode 100644 gdb.policy diff --git a/.install.sh b/.install.sh deleted file mode 100755 index ad955f9..0000000 --- a/.install.sh +++ /dev/null @@ -1,6 +0,0 @@ -make -gcc compile/resources.c compile/ubl-cmake.h source/view_set_disk.h source/view_set_disk.c source/view_check_user_table.c source/view_check_user_table.h source/view_filters.c source/model/vector.c source/model/vector.h source/view_filters.h source/view_temp_u_g_p.c source/view_temp_u_g_p.h source/controler.h source/controler.c source/model/philos_utils.h source/model/philos_utils.c source/model/my_device.h source/model/save.h source/model/save.c source/model/my_device.c source/model/model.h source/model/load.h source/model/load.c source/model/model.c source/ubl-settings-diskquota.c source/ubl-settings-diskquota.h source/ubl-strings.h source/model/ubl-utils.c source/model/ubl-utils.h -o ubl-settings-diskquota `pkg-config --cflags --libs gtk+-3.0 vte-2.91 webkit2gtk-4.0 webkit2gtk-web-extension-4.0` -g -sudo make install clean -cd ./terminal-commands -make -cd ../ diff --git a/Makefile b/Makefile index c0be6ef..1e14edf 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,10 @@ CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile DEPENDS = /bin/cmake -PREFIX ?= /usr +PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) +FILE_VER = source/${PKGNAME}.h +PKGIDENT=$(subst /,-,${PREFIX}) default_target: all @@ -21,11 +23,16 @@ all: init build init: @echo "Initialize ..."; \ if [ -d ".git" ]; then \ - LATEST_TAG=$$(git describe --tags | sed 's/^v//'|grep -oE "^[0-9]{1,}.[0-9]{1,}"); \ + LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \ + if [ -z "$${LATEST_TAG}" ]; \ + then \ + LATEST_TAG=$$"0.0"; \ + echo "$${LATEST_TAG} is empty"; \ + fi; \ else \ - LATEST_TAG="0.0"; \ + LATEST_TAG="Development"; \ fi; \ - sed -r "s/^(string version_application).*/\1=\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.h; \ + sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -43,8 +50,6 @@ debug: @echo "Debug ..." if [ ! -d ${CMAKE_BUILD_DIR} ]; then \ $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \ - @gcc compile/resources.c compile/ubl-cmake.h source/view_set_disk.h source/view_set_disk.c source/view_check_user_table.c source/view_check_user_table.h source/view_filters.c source/model/vector.c source/model/vector.h source/view_filters.h source/view_temp_u_g_p.c source/view_temp_u_g_p.h source/controler.h source/controler.c source/model/philos_utils.h source/model/philos_utils.c source/model/my_device.h source/model/save.h source/model/save.c source/model/my_device.c source/model/model.h source/model/load.h source/model/load.c source/model/model.c source/ubl-settings-diskquota.c source/ubl-settings-diskquota.h source/ubl-strings.h source/model/ubl-utils.c source/model/ubl-utils.h -o ubl-settings-diskquota `pkg-config --cflags --libs gtk+-3.0 vte-2.91 webkit2gtk-4.0 webkit2gtk-web-extension-4.0` -g - fi; \ echo "Debug: OK" @@ -66,7 +71,8 @@ check: build: depend prepare @echo "Build ..."; \ - make --directory=${CMAKE_BUILD_DIR}; \ + $(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \ + sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \ echo "Build: OK" uninstall: @@ -74,7 +80,7 @@ uninstall: @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ @@ -89,9 +95,7 @@ uninstall: @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" - @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/com.ublinux.${PKGNAME}.checked.svg" - @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/com.ublinux.${PKGNAME}.warning.svg" - @$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy" + @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ @@ -103,9 +107,9 @@ install: check uninstall @echo "Install ..." @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ + install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ echo "$${FILE_PO}"; \ msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ done @@ -113,25 +117,22 @@ install: check uninstall install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done - @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" + @cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy + @sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i + @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel.svg" - @install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "gdb.policy" - @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" - @install -dm755 "${DESTDIR}/etc/xdg" - @install -dm755 "${DESTDIR}${PREFIX}/share/applications" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" + @ldconfig -n /usr/local/lib @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ fi @echo "Install: OK" - @sed -r "s/^(string version_application=\"*\").*/string version_application;/" -i source/${PKGNAME}.h; \ clean: @echo "Clean ..." @@ -151,5 +152,4 @@ help: echo "... compile"; \ echo "... install"; \ echo "... uninstall"; \ - echo "... clean" - + echo "... clean" \ No newline at end of file diff --git a/com.ublinux.ubl-settings-diskquota.funnel.svg b/com.ublinux.ubl-settings-diskquota.funnel-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-diskquota.funnel.svg rename to com.ublinux.ubl-settings-diskquota.funnel-symbolic.svg diff --git a/gdb.policy b/gdb.policy deleted file mode 100644 index c1a7da0..0000000 --- a/gdb.policy +++ /dev/null @@ -1,24 +0,0 @@ - - - - - UBLinux - https://ublinux.ru - - - Run ubl-settings-diskquota as root - Запуск утилиты ubl-settings-diskquota с правами root - Authentication is required to run ubl-settings-diskquota - Требуется авторизация для запуска утилиты ubl-settings-diskquota с правами root - - auth_admin - auth_admin - auth_admin - - /usr/bin/gdb - true - - - diff --git a/source/controler.c b/source/controler.c index d4ab4ad..42d3b56 100644 --- a/source/controler.c +++ b/source/controler.c @@ -369,6 +369,7 @@ void wrapper_all_save() { yon_ubl_status_box_render(MESS_NOTHING_SAVE, BACKGROUND_IMAGE_SUCCESS_TYPE); } } + void wrapper_global_save() { if (wrapper_template_save(&all_config, CMD_SAVE_GLOBAL, CMD_REMOVE_GLOBAL)) { yon_ubl_status_box_render(GLOBAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); diff --git a/source/ubl-settings-diskquota.h b/source/ubl-settings-diskquota.h index dc27156..0f13a2d 100755 --- a/source/ubl-settings-diskquota.h +++ b/source/ubl-settings-diskquota.h @@ -109,7 +109,7 @@ typedef struct { } documentation_confirmation_window; typedef char* string; -static string version_application=""; +static string version_application; main_window *setup_window(main_window* widgets, custom_window* custom_widgets); diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 7e349b7..ed7f103 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -369,36 +369,75 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 1 10 - + + + + + + True + False + process-stop-symbolic + + False False + 450 True - com.ublinux.ubl-settings-diskquota + dialog-question-symbolic True False + 5 + 5 + 5 + 5 + 5 + 5 vertical + 10 True False - vertical - + + True + False + start + 20 + 20 + dialog-information-symbolic + 6 + + + False + True + 0 + + + + True False + vertical - + True False - 5 - 5 - 5 - 5 - 5 + start + 10 5 - Device: + Warning + True + 0 + + + + + False @@ -407,40 +446,158 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 1 - - - - + True False - 5 - 5 - 5 - 5 - 5 - 5 + start + start + 10 + 10 + The selected directory is not located on the target device + True 0 + False True - 2 + 1 + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + 30 + True + + + Cancel + True + True + True + image1 + + + + True + True + 0 + + + + + False + True + 1 + + + + + + + True + False + True + + + True + False + Disk quotas + + + + + + + + + + True + False + value-increase-symbolic + + + True + False + value-increase-symbolic + + + True + False + value-increase-symbolic + + + True + False + value-increase-symbolic + + + True + False + emblem-ok-symbolic + + + True + False + emblem-ok-symbolic + + + False + start + False + True + com.ublinux.ubl-settings-diskquota + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Device: False @@ -449,50 +606,94 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Quota use status: - 0 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 1 - 1 - - Not set - Off - On - + 5 + 5 + 5 + 5 + 5 + 5 + + + True + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0 + + + False + True + 2 + + + + + True + True + 0 + + + + + True + False + vertical + + + True + False + vertical + + + + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Quota use status: + 0 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0 True @@ -502,54 +703,158 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - False + True True 1 - + + + + True False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - 0.5899999737739563 - in - + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + UserGropProject: + 0 + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + entrycompletion4 + + + True + True + 1 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + False + avatar-default-symbolic + + + + + False + False + 2 + + + + + False + True + 3 + + + + + True + False + vertical + + + + + True False - + True False 5 5 5 5 + 5 + 5 + Catalog: + 0 + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 255 + entrycompletion1 + + + True + True + 1 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 5 - + True False + center - + True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment35 + False + zoom-fit-symbolic False @@ -558,17 +863,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False - 5 - 5 - 5 - 5 - 5 - 5 - weeks - 0 + Review False @@ -577,466 +875,145 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - False - True - 0 - - - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment34 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - days - 0 - - - False - True - 1 - - - - - False - True - 1 - - - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment33 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - hours - 0 - - - False - True - 1 - - - - - False - True - 2 - - - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment32 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - minutes - 0 - - - False - True - 1 - - - - - False - True - 3 - + + False + True + 2 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + label + + + False + True + 3 + + + False + True + 1 + - - - True - False - The postponement period for exceeding the volume: - + + False True - 2 + 4 - + True False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - + True False - + True False 5 5 5 5 + 5 5 - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment5 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - weeks - 0 - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment7 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - days - 0 - - - False - True - 1 - - - - - False - True - 1 - - - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment9 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - hours - 0 - - - False - True - 1 - - - - - False - True - 2 - - - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment11 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - minutes - 0 - - - False - True - 1 - - - - - False - True - 3 - - + Project ID: + 0 + + + False + True + 0 + + + + + Auto + True + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + + False + True + 1 + + + False + True + 1 + - - + + True - False - The delay period for exceeding files: + True + 5 + 5 + 5 + 5 + 5 + 5 + 5 + entrycompletion2 + number + + True + True + 3 + - - - False - True - 3 - - - - - True - True - 1 - - - - - True - False - vertical - True - - - True - False - end - 5 - True - - gtk-cancel + True - True - True + False 5 5 5 5 5 5 - True + label + 0 False True - 0 + 4 - - gtk-save + + Generate True True True @@ -1046,168 +1023,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 5 5 5 - True False True - 1 + end + 6 False True - 0 + 5 - - - False - True - 2 - - - - - True - True - 1 - - - - - - - True - False - True - - - True - False - Settings device - Addition - - - - - - - - True - False - 32 - com.ublinux.ubl-settings-diskquota - 5 - - - - - - - - - - - False - start - False - True - com.ublinux.ubl-settings-diskquota - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Device: - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0 - - - False - True - 2 - - - - - True - True - 0 - - - - - True - False - vertical - - - True - False - vertical - + True False - + True False 5 @@ -1216,7 +1055,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 5 5 5 - Quota use status: + Project Name: 0 @@ -1226,16 +1065,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True - False + True 5 5 5 5 5 5 - 0 + 12 + entrycompletion3 True @@ -1245,158 +1085,85 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - True + False True - 1 + 7 + + + False + True + 0 + + + + + True + False + True - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - UserGropProject: - 0 - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - entrycompletion4 - - - True - True - 1 - - - - - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - avatar-default-symbolic - - - - - False - False - 2 - - - - - False - True - 3 - - - - + True False - vertical - - - + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in - + True False + 5 + 5 + 5 + 5 - + True False - 5 - 5 - 5 - 5 - 5 - 5 - Catalog: - 0 - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 255 - entrycompletion1 - - - True - True - 1 - - - - - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 + vertical + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Soft limit + 0 + + + False + True + 1 + + True False - center + 5 - + True - False - gtk-zoom-fit + True + False + 5 + 5 + 5 + 5 + right + True False @@ -1405,261 +1172,173 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + + True + True + 7 + 0 + adjustment1 + + + True + True + 1 + + + + True False - Review + 5 + 5 + 5 + 5 + 0 + 0 + + Kb + Mb + Gb + Tb + + + + False + True + 2 + + + + + True + True + 2 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Hard limit + 0 + + + False + True + 3 + + + + + True + False + False + 5 + + + True + True + False + 5 + 5 + 5 + 5 + right + True False True + 0 + + + + + True + True + 7 + 0 + adjustment2 + + + True + True 1 + + + True + False + 5 + 5 + 5 + 5 + 0 + 0 + + Kb + Mb + Gb + Tb + + + + False + True + 2 + + + + True + True + 4 + - - False - True - 2 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - label - - - False - True - 3 - - - False - True - 1 - - - + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Size + - False + True True - 4 + 0 - + True False + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Project ID: - 0 - - - False - True - 0 - - - - - Auto - True - True - False - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 1 - - - - - False - True - 1 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 5 - entrycompletion2 - number - - - True - True - 3 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - label - 0 - - - False - True - 4 - - - - - Generate - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - False - True - end - 6 - - - - - False - True - 5 - - - - - - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Project Name: - 0 - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 12 - entrycompletion3 - - - True - True - 1 - - - - - False - True - 7 - - - - - - - - False - True - 0 - - - - - True - False - True - - - True - False - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - + True False 5 @@ -1672,7 +1351,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False vertical - + True False 5 @@ -1696,14 +1375,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False 5 - + True True False - 5 - 5 - 5 - 5 right True @@ -1714,12 +1389,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True True 7 0 - adjustment1 + adjustment3 True @@ -1728,21 +1403,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False 5 5 5 5 - 0 - 0 - - Kb - Mb - Gb - Tb - + files False @@ -1758,7 +1426,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False 5 @@ -1780,17 +1448,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - False 5 - + True True False - 5 - 5 - 5 - 5 right True @@ -1801,12 +1464,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True True 7 0 - adjustment2 + adjustment4 True @@ -1815,21 +1478,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False 5 5 5 5 - 0 - 0 - - Kb - Mb - Gb - Tb - + files False @@ -1849,7 +1505,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False 5 @@ -1858,212 +1514,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 5 5 5 - Size + Files True True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 5 - 5 - 5 - 5 - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Soft limit - 0 - - - False - True - 1 - - - - - True - False - 5 - - - True - True - False - right - True - - - False - True - 0 - - - - - True - True - 7 - 0 - adjustment3 - - - True - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - files - - - False - True - 2 - - - - - True - True - 2 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Hard limit - 0 - - - False - True - 3 - - - - - True - False - 5 - - - True - True - False - right - True - - - False - True - 0 - - - - - True - True - 7 - 0 - adjustment4 - - - True - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - files - - - False - True - 2 - - - - - True - True - 4 - - - - - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Files - - - - - True - True - 1 + 1 @@ -2115,7 +1573,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - gtk-save + Save True True True @@ -2125,7 +1583,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 5 5 5 - True + image4 False @@ -2176,71 +1634,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False - process-stop-symbolic + emblem-ok-symbolic - + False False - 450 True - dialog-question-symbolic + com.ublinux.ubl-settings-diskquota True False - 5 - 5 - 5 - 5 - 5 - 5 vertical - 10 True False + vertical - - True - False - start - 20 - 20 - dialog-information-symbolic - 6 - - - False - True - 0 - - - - + True False - vertical - + True False - start - 10 + 5 + 5 + 5 + 5 + 5 5 - Warning - True - 0 - - - - - + Device: False @@ -2249,184 +1677,99 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False - start - start - 10 - 10 - The selected directory is not located on the target device - True - 0 - + 5 + 5 + 5 + 5 + 5 + 5 - False + True True 1 - - - - True - True - 1 - - - - - - True - True - 0 - - - - - True - False - 30 - True - - - Cancel - True - True - True - image1 - - - - True - True - 0 - - - - - False - True - 1 - - - - - - - True - False - True - - - True - False - Disk quotas - - - - - - - - - - True - False - process-stop-symbolic - - - True - False - emblem-ok-symbolic - - - False - False - 450 - dialog-question-symbolic - - - True - False - 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 + 5 + 5 + 5 + 5 5 - Would you like to read documentation in the Web? - True 0 - - - - False True - 0 + 2 + + + False + True + 0 + + + + + True + False + vertical - + True False - start - start - 10 - 10 - You will be redirected to documentation website where documentation is -translated and supported by community. - True - 0 - + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Quota use status: + 0 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 1 + 1 + + Not set + Off + On + + + + True + True + 1 + + False @@ -2435,366 +1778,515 @@ translated and supported by community. - - 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 - - - - - Open documentation - True - True - True - image9 - - - - True - True - 1 - - - - - False - True - 1 - - - - - - - True - False - True - - - True - False - Disk quotas - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - 250 - 400 - com.ublinux.ubl-settings-diskquota - - - True - False - vertical - - - True - False - vertical - - - True - False - vertical - - - Withdraw all users - True - True - False + False 5 5 5 5 5 5 - True - - - False - True - 0 - - - - - True - True - external - always + 0.019999999552965164 + 0.5899999737739563 in - + True False - + True - True - liststoreUsersGroups - 0 - - - + False + 5 + 5 + 5 + 5 + 5 - + + True + False - - - 0 - - - - - - - Users + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment35 + + + False + True + 0 + + - - - 1 - + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + weeks + 0 + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment34 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + days + 0 + + + False + True + 1 + + + + + False + True + 1 + + + + + True + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment33 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + hours + 0 + + + False + True + 1 + + + + + False + True + 2 + + + + + True + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment32 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + minutes + 0 + + + False + True + 1 + + + False + True + 3 + + + + True + False + The postponement period for exceeding the volume: + + - True + False True - 1 + 2 - - - True - True - 0 - - - - - True - False - vertical - True - + True False - end - 5 - True - - - gtk-cancel - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 0 - - + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in - - gtk-save + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + + + True + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment5 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + weeks + 0 + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment7 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + days + 0 + + + False + True + 1 + + + + + False + True + 1 + + + + + True + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment9 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + hours + 0 + + + False + True + 1 + + + + + False + True + 2 + + + + + True + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment11 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + minutes + 0 + + + False + True + 1 + + + + + False + True + 3 + + + + + + + + + True + False + The delay period for exceeding files: + + + + + False + True + 3 + + + + + True + True + 1 + + + + + True + False + vertical + True + + + True + False + end + 5 + True + + + gtk-cancel True True True @@ -2809,11 +2301,31 @@ translated and supported by community. False True - 1 + 0 - - + + + Save + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + image5 + + + False + True + 1 + + + + False True 0 @@ -2823,7 +2335,7 @@ translated and supported by community. False True - 1 + 2 @@ -2841,10 +2353,10 @@ translated and supported by community. False True - + True False - Users + Settings device - Addition @@ -2862,134 +2374,125 @@ translated and supported by community. - + True False - False - - - True - False - Load global configuration - - - - - - True + emblem-ok-symbolic + + + False + Please select folder + True + center + 500 + 400 + True + com.ublinux.ubl-settings-diskquota + dialog + True + True + a + select-folder + + False - Load local configuration - + vertical + 2 + + + False + end + + + gtk-cancel + True + True + True + True + + + True + True + 0 + + + + + OK + True + True + True + image6 + + + True + True + 1 + + + + + False + False + 0 + + + + + - - True - False - False - False - - + True False - False - - - True - False - Save configuration - - - - - - True - False - Save to global configuration - - - - - - True - False - Save to local configuration - - - + emblem-ok-symbolic - - 800 - 600 + False - 760 - 560 + start + False com.ublinux.ubl-settings-diskquota - + True False + 5 + 5 + 5 + 5 + 5 + 5 vertical + + + Name + True + True + False + start + 5 + True + + + False + True + 0 + + True False vertical - + + Device True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 25 - - - False - True - 0 - - - - - True - False - start - 5 - 5 - 5 - 5 - 6 - 6 - True - - - - - - - False - True - 1 - - + True + False + 0 + True False @@ -2998,32 +2501,12 @@ translated and supported by community. - + + Catalog True - False - vertical - - - 81 - True - False - - - True - False - start - - - -1 - - - - - False - True - 0 - - + True + False + True False @@ -3032,7 +2515,901 @@ translated and supported by community. - + + ID + True + True + False + True + + + False + True + 4 + + + + + Project Name + True + True + False + start + True + + + False + True + 5 + + + + + False + True + 1 + + + + + Soft limit (volume) + True + True + False + start + True + + + False + True + 2 + + + + + Hard limit (volume) + True + True + False + start + True + + + False + True + 3 + + + + + True + False + end + 5 + 5 + True + + + gtk-cancel + True + True + True + center + True + + + False + True + 0 + + + + + Save + True + True + True + center + image7 + + + False + True + 1 + + + + + False + True + end + 5 + + + + + Postponing the hard limit (volume) + True + True + False + start + True + + + False + True + 8 + + + + + Soft limit (files) + True + True + False + start + True + + + False + True + 10 + + + + + Hard limit (files) + True + True + False + start + True + + + False + True + 12 + + + + + Postponing the hard limit (files) + True + True + False + start + True + + + False + True + 13 + + + + + + + True + False + True + + + True + False + Filters + + + + + + + + True + False + 32 + com.ublinux.ubl-settings-diskquota + 5 + + + + + + + True + False + process-stop-symbolic + + + True + False + emblem-ok-symbolic + + + False + False + 450 + dialog-question-symbolic + + + True + False + 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 + + + + + Open documentation + True + True + True + image9 + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + True + False + True + + + True + False + Disk quotas + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + 250 + 400 + com.ublinux.ubl-settings-diskquota + + + True + False + vertical + + + True + False + vertical + + + True + False + vertical + + + Withdraw all users + True + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + 0 + + + + + True + True + external + always + in + + + True + False + + + True + True + liststoreUsersGroups + 0 + + + + + + + + + 0 + + + + + + + Users + + + + 1 + + + + + + + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + vertical + True + + + True + False + end + 5 + True + + + gtk-cancel + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + 0 + + + + + Save + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + image3 + + + False + True + 1 + + + + + False + True + 0 + + + + + False + True + 1 + + + + + True + True + 1 + + + + + + + True + False + True + + + True + False + Users + + + + + + + + True + False + 32 + com.ublinux.ubl-settings-diskquota + 5 + + + + + + + True + False + False + + + True + False + Load global configuration + + + + + + True + False + Load local configuration + + + + + + True + False + False + False + + + True + False + False + + + True + False + Save configuration + + + + + + True + False + Save to global configuration + + + + + + True + False + Save to local configuration + + + + + + 800 + 600 + False + Disk quotas + 760 + 560 + com.ublinux.ubl-settings-diskquota + + + True + False + vertical + + + True + False + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 25 + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 6 + 6 + True + + + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + vertical + + + 81 + True + False + + + True + False + start + + + -1 + + + + + False + True + 0 + + + + + False + True + 1 + + + + True False 5 @@ -3100,7 +3477,9 @@ translated and supported by community. - autosize + True + fixed + 5 Status True @@ -3113,6 +3492,9 @@ translated and supported by community. + True + fixed + 5 Quotas @@ -3124,7 +3506,9 @@ translated and supported by community. - autosize + True + fixed + 5 Quota type True @@ -3139,7 +3523,9 @@ translated and supported by community. - autosize + True + fixed + 5 Device/ Project True @@ -3153,7 +3539,9 @@ Project - autosize + True + fixed + 5 Users True @@ -3168,7 +3556,9 @@ Project - autosize + True + fixed + 5 Groups True @@ -3183,7 +3573,9 @@ Project - autosize + True + fixed + 5 Projects True @@ -3198,7 +3590,9 @@ Project - autosize + True + fixed + 5 Soft restriction (volume) @@ -3215,7 +3609,9 @@ restriction - autosize + True + fixed + 5 Hard limit (volume) @@ -3232,7 +3628,9 @@ limit - autosize + True + fixed + 5 Postponing the hard @@ -3251,7 +3649,9 @@ limit - autosize + True + fixed + 5 Soft restriction (files) @@ -3268,7 +3668,9 @@ restriction - autosize + True + fixed + 5 Hard limit (files) @@ -3285,7 +3687,9 @@ limit - autosize + True + fixed + 5 Postponing the hard @@ -3326,160 +3730,220 @@ limit - - 100 + True - True - in + False + vertical - + + 100 True - False + True + in - + True False - vertical - + True - True - liststoreDevice - 0 - - - + False + vertical - - autosize - Status - True - - - - 0 - + + True + True + liststoreDevice + 0 + + - - - - - Device - True - - - 1 - + + True + fixed + 5 + Status + True + + + + 0 + + + - - - - - autosize - Mount -point - True - - word + + True + fixed + 5 + Device + True + + + + 1 + + - - 2 - - - - - - autosize - FS - True - - word + + True + fixed + 5 + Mount +point + True + + + word + + + 2 + + - - 3 - - - - - - autosize - Name - True - - word + + True + fixed + 5 + FS + True + + + word + + + 3 + + - - 4 - - - - - - autosize - The postponement period -for exceeding the volume - True - - word + + True + fixed + 5 + Name + True + + + word + + + 4 + + + + + + + True + fixed + 5 + The postponement period +for exceeding the volume + True + + + word + + + 5 + + - - 5 - - - - - - autosize - The delay period -for exceeding files - True - - word + + True + fixed + 5 + The delay period +for exceeding files + True + + + word + + + 6 + + - - 6 - + + True + True + 2 + + + + + + + True + True + 0 + + + + + True + False + + + True + False + + + gtk-delete + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + True + - True + False True - 2 + 0 - + True - False + True + True + 5 + 5 + 5 + 5 + 5 + 5 True False - - gtk-delete + True - True - True + False 5 - 5 5 - 5 - 5 - 5 - True + document-edit-symbolic False @@ -3488,52 +3952,14 @@ for exceeding files - + True - True - True + False 5 5 5 5 - 5 - 5 - - - True - False - - - True - False - 5 - 5 - gtk-edit - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - - + Edit False @@ -3541,45 +3967,50 @@ for exceeding files 1 - - - gtk-add - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 2 - - - - False - True - end - 1 - False True - end - 3 + 1 + + + + + Add + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + image2 + + + False + True + 2 + + False + True + end + 1 + + + False + True + end + 1 + @@ -3598,240 +4029,302 @@ for exceeding files - - 100 + True - True - in + False + vertical - + + 100 True - False + True + in - + True False - vertical - + True - True - liststoreUser - 0 - - - + False + vertical - - autosize - Name - True + + True + True + liststoreUser + 0 + + + - - word + + True + fixed + 5 + Name + True + + + word + + + 0 + + - - 0 - - - - - - Device - True - - - 1 - + + True + fixed + 5 + Device + True + + + + 1 + + + - - - - - autosize - Soft + + + True + fixed + 5 + Soft restriction (volume) - True - - - word + True + + + word + + + 2 + + - - 2 - - - - - - autosize - Hard + + + True + fixed + 5 + Hard limit (volume) - True - - - word + True + + + word + + + 3 + + - - 3 - - - - - - autosize - Postponing + + + True + fixed + 5 + Postponing the hard limit (volume) - True - - - word + True + + + word + + + 4 + + - - 4 - - - - - - autosize - Soft + + + True + fixed + 5 + Soft restriction (files) - True - - - word + True + + + word + + + 5 + + - - 5 - - - - - - autosize - Hard + + + True + fixed + 5 + Hard limit (files) - True - - - word + True + + + word + + + 6 + + - - 6 - - - - - - autosize - Postponing + + + True + fixed + 5 + Postponing the hard limit (files) - True - - - word + True + + + word + + + 7 + + - - 7 - + + True + True + 2 + - - True - True - 2 - + + + + + True + True + 0 + + + + + True + False + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 True False - + True - True - True + False + com.ublinux.ubl-settings-diskquota.funnel-symbolic + + + False + True + 0 + + + + + True + False 5 - 5 5 - 5 - 5 - 5 - - - True - False - - - True - False - com.ublinux.ubl-settings-diskquota.funnel - - - False - True - 0 - - - - - True - False - 5 - 5 - Filters - - - False - True - 1 - - - - + Filters False True - 0 + 1 + + + + + False + True + 0 + + + + + True + False + + + gtk-delete + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + 0 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 True False - - gtk-delete + True - True - True + False 5 - 5 5 - 5 - 5 - 5 - True + document-edit-symbolic False @@ -3840,52 +4333,14 @@ limit - + True - True - True + False 5 5 5 5 - 5 - 5 - - - True - False - - - True - False - 5 - 5 - gtk-edit - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - - + Edit False @@ -3893,45 +4348,50 @@ limit 1 - - - gtk-add - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 2 - - - - False - True - end - 1 - False True - end - 3 + 1 + + + + + Add + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + image10 + + + False + True + 2 + + False + True + end + 1 + + + False + True + end + 1 + @@ -3950,240 +4410,302 @@ limit - - 100 + True - True - in + False + vertical - + + 100 True - False + True + in - + True False - vertical - + True - True - liststoreGroups - 0 - - - + False + vertical - - autosize - Name - True + + True + True + liststoreGroups + 0 + + + - - word + + True + fixed + 5 + Name + True + + + word + + + 0 + + - - 0 - - - - - - Device - True - - - 1 - + + True + fixed + 5 + Device + True + + + + 1 + + + - - - - - autosize - Soft + + + True + fixed + 5 + Soft restriction (volume) - True - - - word + True + + + word + + + 2 + + - - 2 - - - - - - autosize - Hard + + + True + fixed + 5 + Hard limit (volume) - True - - - word + True + + + word + + + 3 + + - - 3 - - - - - - autosize - Postponing + + + True + fixed + 5 + Postponing the hard limit (volume) - True - - - word + True + + + word + + + 4 + + - - 4 - - - - - - autosize - Soft + + + True + fixed + 5 + Soft restriction (files) - True - - - word + True + + + word + + + 5 + + - - 5 - - - - - - autosize - Hard + + + True + fixed + 5 + Hard limit (files) - True - - - word + True + + + word + + + 6 + + - - 6 - - - - - - autosize - Postponing + + + True + fixed + 5 + Postponing the hard limit (files) - True - - - word + True + + + word + + + 7 + + - - 7 - + + True + True + 2 + - - True - True - 2 - + + + + + True + True + 0 + + + + + True + False + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 True False - + True - True - True + False + com.ublinux.ubl-settings-diskquota.funnel-symbolic + + + False + True + 0 + + + + + True + False 5 - 5 5 - 5 - 5 - 5 - - - True - False - - - True - False - com.ublinux.ubl-settings-diskquota.funnel - - - False - True - 0 - - - - - True - False - 5 - 5 - Filters - - - False - True - 1 - - - - + Filters False True - 0 + 1 + + + + + False + True + 0 + + + + + True + False + + + gtk-delete + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + 0 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 True False - - gtk-delete + True - True - True + False 5 - 5 5 - 5 - 5 - 5 - True + document-edit-symbolic False @@ -4192,52 +4714,14 @@ limit - + True - True - True + False 5 5 5 5 - 5 - 5 - - - True - False - - - True - False - 5 - 5 - gtk-edit - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - - + Edit False @@ -4245,45 +4729,50 @@ limit 1 - - - gtk-add - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 2 - - - - False - True - end - 1 - False True - end - 3 + 1 + + + + + Add + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + image11 + + + False + True + 2 + + False + True + end + 1 + + + False + True + end + 1 + @@ -4303,241 +4792,257 @@ limit - - 100 + True - True - in + False + vertical - + + 100 True - False + True + external - + True False - vertical + none - + True - True - liststoreProject - 0 - - - + False + vertical - - Device - True + + True + True + liststoreProject + 0 + + + - - - 0 - + + True + fixed + 5 + Device + True + + + + 0 + + + - - - - - Catalog - True - - - 1 - + + True + fixed + 5 + Catalog + True + + + + 1 + + + - - - - - autosize - ID - True - - word + + True + fixed + 5 + ID + True + + + word + + + 2 + + - - 2 - - - - - - autosize - Project Name - True - - - 3 - + + True + fixed + 5 + Project Name + True + + + + 3 + + + - - - - - autosize - Soft + + + True + fixed + 5 + Soft restriction (volume) - True - - - word + True + + + word + + + 4 + + - - 4 - - - - - - autosize - Hard + + + True + fixed + 5 + Hard limit (volume) - True - - - word + True + + + word + + + 5 + + - - 5 - - - - - - autosize - Postponing + + + True + fixed + 5 + Postponing the hard limit (volume) - True - - - word + True + + + word + + + 6 + + - - 6 - - - - - - autosize - Soft + + + True + fixed + 5 + Soft restriction (files) - True - - - word + True + + + word + + + 7 + + - - 7 - - - - - - autosize - Hard + + + True + fixed + 5 + Hard limit (files) - True - - - word + True + + + word + + + 8 + + - - 8 - - - - - - autosize - Postponing + + + True + fixed + 5 + Postponing the hard limit (files) - True - - - word + True + + + word + + + 9 + + - - 9 - + + True + True + 2 + - - True - True - 2 - + + + + + True + True + 0 + + + + + True + False + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 True - False - - - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - com.ublinux.ubl-settings-diskquota.funnel - - - False - True - 0 - - - - - True - False - 5 - 5 - Filters - - - False - True - 1 - - - - + False + + + True + False + com.ublinux.ubl-settings-diskquota.funnel-symbolic False @@ -4546,307 +5051,165 @@ limit - + True False - - - gtk-delete - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 0 - - - - - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - 5 - 5 - gtk-edit - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - - - - - False - True - 1 - - - - - gtk-add - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 2 - - + 5 + 5 + Filters False True - end 1 + + + + False + True + 0 + + + + + True + False + + + gtk-delete + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + True + False True - end - 3 + 0 - - - - - - - 4 - - - - - True - False - Projects - - - 4 - False - - - - - True - True - 0 - - - - - False - True - 0 - - - - - False - True - 0 - - - - - False - True - 2 - - - - - True - True - 0 - - - - - - - True - False - True - - - True - False - 5 - 5 - 5 - 5 - 2 - Disk quotas - - - - - - - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 32 - com.ublinux.ubl-settings-diskquota - - - - - True - False - - - True - True - False - True - menu3 - - - True - False - - - True - False - Save - - - False - True - 0 - - - - - True - False - pan-down-symbolic - - - False - True - 1 - - - - - - - False - True - 0 - - - - - True - True - True - False - True - True - menu2 - none - - - - - - - False - True - 1 - - - - - end - 1 - - - - - True - False - - - True - True - False - True - menu1 - - - True - False - - - True - False - Load + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + False + + + True + False + 5 + 5 + document-edit-symbolic + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Edit + + + False + True + 1 + + + + + + + False + True + 1 + + + + + Add + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + image12 + + + False + True + 2 + + + + + False + True + end + 1 + + + + + False + True + end + 1 + + + + + 4 + + + + + True + False + Projects + + + 4 + False + + + + + True + True + 0 + + False @@ -4854,250 +5217,104 @@ limit 0 - - - True - False - pan-down-symbolic - - - False - True - 1 - - - - - - False - True - 0 - - - - - 2 - - - - - - - - False - Please select folder - True - center - 500 - 400 - True - com.ublinux.ubl-settings-diskquota - dialog - True - True - a - select-folder - - - False - vertical - 2 - - - False - end - - - gtk-cancel - True - True - True - True - - - True - True - 0 - - - - - gtk-ok - True - True - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - - - - - - False - start - False - com.ublinux.ubl-settings-diskquota - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - vertical - - - Name - True - True - False - start - 5 - True - - - False - True - 0 - - - - - True - False - vertical - - - Device - True - True - False - 0 - True - - - False - True - 0 - - - - - Catalog - True - True - False - True - - - False - True - 1 - - - - - ID - True - True - False - True - - - False - True - 4 - - - - - Project Name - True - True - False - start - True + + False + True + 0 + + False True - 5 + 2 - False + True True - 1 + 0 - - - Soft limit (volume) + + + + + True + False + True + + True - True - False - start - True + False + 5 + 5 + 5 + 5 + 2 + Disk quotas + + + - - False - True - 2 - - - Hard limit (volume) + True - True - False - start - True + False + 5 + 5 + 5 + 5 + 6 + 6 + 32 + com.ublinux.ubl-settings-diskquota - - False - True - 3 - - + True False - end - 5 - 5 - True - - gtk-cancel + True True + False True - center - True + menu3 + + + True + False + + + True + False + Save + + + False + True + 0 + + + + + True + False + pan-down-symbolic + + + False + True + 1 + + + + False @@ -5106,13 +5323,21 @@ limit - - gtk-save + True + True True + False True - center - True + True + menu2 + none + + + + False @@ -5122,98 +5347,66 @@ limit - False - True end - 5 - - - - - Postponing the hard limit (volume) - True - True - False - start - True - - - False - True - 8 - - - - - Soft limit (files) - True - True - False - start - True - - - False - True - 10 - - - - - Hard limit (files) - True - True - False - start - True - - - False - True - 12 + 1 - - Postponing the hard limit (files) + True - True - False - start - True + False + + + True + True + False + True + menu1 + + + True + False + + + True + False + Load + + + False + True + 0 + + + + + True + False + pan-down-symbolic + + + False + True + 1 + + + + + + + False + True + 0 + + - False - True - 13 + 2 - - - - - True - False - True - - - True - False - Filters - - - - - - - - True - False - 32 - com.ublinux.ubl-settings-diskquota - 5 - - + From e5402e077d88980e91cc492793f4adc4eb80c399 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 8 Aug 2023 16:33:01 +0600 Subject: [PATCH 02/10] Icon update - replaced with symbolic --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1e14edf..f309614 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ install: check uninstall @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel-symbolic.svg" @ldconfig -n /usr/local/lib @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ From 2f51af2196c3e92b2f14f7495482f2f1378aa4c8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 8 Aug 2023 16:34:20 +0600 Subject: [PATCH 03/10] Fixed allowing input for disabled quotas --- source/controler.c | 9 + source/view_set_disk.c | 1 + source/view_set_disk.h | 1 + ubl-settings-diskquota.glade | 787 ++++++++++++++++++----------------- 4 files changed, 411 insertions(+), 387 deletions(-) diff --git a/source/controler.c b/source/controler.c index 42d3b56..75b8b33 100644 --- a/source/controler.c +++ b/source/controler.c @@ -181,6 +181,14 @@ void wrapper_edit_view_device_show(GtkWidget* self) { g_signal_connect(G_OBJECT(get_widget_view_device()->btnSaveTempSave),"clicked",G_CALLBACK(entry_device_disk),&i); } +void on_status_changed(){ + int active = gtk_combo_box_get_active(GTK_COMBO_BOX(get_widget_view_device()->cmbDeviceSetStatus)); + if (active == 0|| active ==1) + gtk_widget_set_sensitive(get_widget_view_device()->boxBlockDisabledStatus,0); + else + gtk_widget_set_sensitive(get_widget_view_device()->boxBlockDisabledStatus,1); +} + void wrapper_add_view_device_show(GtkWidget* self) { view_device_set_vector_device(&all_config.v_disk_status); view_device_set_index(-1); @@ -189,6 +197,7 @@ void wrapper_add_view_device_show(GtkWidget* self) { view_device_show(NULL, glade_path); int i = 0; g_signal_connect(G_OBJECT(get_widget_view_device()->btnSaveTempSave),"clicked",G_CALLBACK(entry_device_disk),&i); + g_signal_connect(G_OBJECT(get_widget_view_device()->cmbDeviceSetStatus),"changed",G_CALLBACK(on_status_changed),NULL); } void block_tree_view(hotebook* widgets,void (*f)()) { diff --git a/source/view_set_disk.c b/source/view_set_disk.c index 5d9a68c..e8b743e 100644 --- a/source/view_set_disk.c +++ b/source/view_set_disk.c @@ -53,6 +53,7 @@ view_device_set_window *view_device_setup_window_custom(view_device_set_window* obj_view_device_widgets->DeviceCombo = yon_gtk_builder_get_widget(builder,"DeviceCombo"); obj_view_device_widgets->lblHeadQuotasEditDeviceWindow = yon_gtk_builder_get_widget(builder,"lblHeadQuotasEditDeviceWindow"); obj_view_device_widgets->boxBlockGuiAddEditDevice = yon_gtk_builder_get_widget(builder,"boxBlockGuiAddEditDevice"); + obj_view_device_widgets->boxBlockDisabledStatus = yon_gtk_builder_get_widget(builder,"boxBlockDisabledStatus"); if (strcmp(view_device_set_add_edit, "add") == 0) { gtk_label_set_label(GTK_LABEL(obj_view_device_widgets->lblHeadQuotasEditDeviceWindow), STR_TITLE_ADD_QUOTAS); gtk_widget_hide(obj_view_device_widgets->lblNameDevice); diff --git a/source/view_set_disk.h b/source/view_set_disk.h index 34c08dd..b14c47b 100644 --- a/source/view_set_disk.h +++ b/source/view_set_disk.h @@ -35,6 +35,7 @@ typedef struct { GtkWidget* cmbDeviceSetStatus; GtkWidget* lblHeadQuotasEditDeviceWindow; GtkWidget* boxBlockGuiAddEditDevice; + GtkWidget* boxBlockDisabledStatus; char* name; } view_device_set_window; diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index ed7f103..571c496 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -1774,202 +1774,83 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False True - 1 + 0 - + True False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - 0.5899999737739563 - in + vertical - + True False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + 0.5899999737739563 + in - + True False - 5 - 5 - 5 - 5 - 5 - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment35 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - weeks - 0 - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment34 - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - days - 0 - - - False - True - 1 - - - - - False - True - 1 - - - - + True False + 5 + 5 + 5 + 5 + 5 - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment33 - - - False - True - 0 - - - - + True False - 5 - 5 - 5 - 5 - 5 - 5 - hours - 0 - - - False - True - 1 - - - - - False - True - 2 - - - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment32 + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment35 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + weeks + 0 + + + False + True + 1 + + False @@ -1978,17 +1859,48 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False - 5 - 5 - 5 - 5 - 5 - 5 - minutes - 0 + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment34 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + days + 0 + + + False + True + 1 + + False @@ -1996,173 +1908,192 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 1 - - - False - True - 3 - - - - - - - - - True - False - The postponement period for exceeding the volume: - - - - - False - True - 2 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment5 - - - False - True - 0 - - - + True False - 5 - 5 - 5 - 5 - 5 - 5 - weeks - 0 - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment7 + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment33 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + hours + 0 + + + False + True + 1 + + False True - 0 + 2 - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - days - 0 + + True + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment32 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + minutes + 0 + + + False + True + 1 + + False True - 1 + 3 - - False - True - 1 - + + + + + True + False + The postponement period for exceeding the volume: + + + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False - + True False + 5 + 5 + 5 + 5 + 5 - + True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment9 + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment5 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + weeks + 0 + + + False + True + 1 + + False @@ -2171,17 +2102,48 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False - 5 - 5 - 5 - 5 - 5 - 5 - hours - 0 + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment7 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + days + 0 + + + False + True + 1 + + False @@ -2189,79 +2151,129 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 1 - - - False - True - 2 - - - - - True - False - + True - True - 5 - 5 - 5 - 5 - 5 - 5 - 4 - 0 - adjustment11 + False + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment9 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + hours + 0 + + + False + True + 1 + + False True - 0 + 2 - + True False - 5 - 5 - 5 - 5 - 5 - 5 - minutes - 0 + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 4 + 0 + adjustment11 + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + minutes + 0 + + + False + True + 1 + + False True - 1 + 3 - - False - True - 3 - + + + True + False + The delay period for exceeding files: + + - - - - True - False - The delay period for exceeding files: - + + False + True + 1 + False True - 3 + 1 @@ -3461,6 +3473,7 @@ translated and supported by community. 300 True True + external in From f02012a06f7a061f96262b749b5cc67f614481db Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 8 Aug 2023 16:34:47 +0600 Subject: [PATCH 04/10] Updated utils header file --- source/model/ubl-utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/model/ubl-utils.h b/source/model/ubl-utils.h index b956787..841561f 100644 --- a/source/model/ubl-utils.h +++ b/source/model/ubl-utils.h @@ -219,8 +219,8 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end enum YON_TYPE{ YON_TYPE_STRING, - YON_TYPE_INT, YON_TYPE_STRING_LIST, + YON_TYPE_INT, YON_TYPE_BOOLEAN, YON_TYPE_OTHER }; @@ -365,4 +365,4 @@ void yon_ubl_browser_window_open(char *link, char *browser_window_name); void yon_ubl_browser_window_open(char *link, char *browser_window_name); #endif #endif -#endif +#endif \ No newline at end of file From 472b60450eef8188f0727674366cde08f19bf82f Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 8 Aug 2023 16:35:27 +0600 Subject: [PATCH 05/10] Added tracking of column width --- source/ubl-settings-diskquota.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/source/ubl-settings-diskquota.c b/source/ubl-settings-diskquota.c index d8823fd..d617d8c 100644 --- a/source/ubl-settings-diskquota.c +++ b/source/ubl-settings-diskquota.c @@ -237,5 +237,36 @@ custom_window *setup_window_custom(custom_window* custom_widgets, GtkBuilder *bu custom_widgets->device.btnDel = yon_gtk_builder_get_widget(builder,"btnDelDevice"); custom_widgets->device.tree_view = yon_gtk_builder_get_widget(builder,"DeviceQuotasTree"); custom_widgets->device.liststore = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststoreDevice")); + + GList *list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->treeViewGeneral)); + for (int i = 0; i < g_list_length(list); i++){ + yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("general_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + } + g_list_free(list); + + list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->device.tree_view)); + for (int i = 0; i < g_list_length(list); i++){ + yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("device_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + } + g_list_free(list); + + list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->user.tree_view)); + for (int i = 0; i < g_list_length(list); i++){ + yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("user_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + } + g_list_free(list); + + list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->group.tree_view)); + for (int i = 0; i < g_list_length(list); i++){ + yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("group_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + } + g_list_free(list); + + list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->project.tree_view)); + for (int i = 0; i < g_list_length(list); i++){ + yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("project_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + } + g_list_free(list); + return custom_widgets; } From cee7b695ee0b1ab1098a9d6dbfd514e94ba72908 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 8 Aug 2023 16:51:24 +0600 Subject: [PATCH 06/10] Fixed bug, leading to warning windows duplicating; Changed no changes warning string --- source/ubl-strings.h | 2 +- ubl-settings-diskquota.glade | 1 + ubl-settings-diskquota.pot | 2 +- ubl-settings-diskquota_ru.po | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index a300675..c1d50aa 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -93,7 +93,7 @@ #define STR_ERROR_PROJECT_NAME_ENTER_VALUE _("Project name required field") #define STR_ERROR_LIST_USER_NULL _("The list of users is empty") #define STR_ERROR_NO_SELECTED_DISK _("To save, you need to select a disk") -#define STR_ERROR_ENTRY_VALUE_VOLUME_OR_FILES _("The volume and files fields must have at least one value") +#define STR_ERROR_ENTRY_VALUE_VOLUME_OR_FILES _("Insert at leat one value before saving") #define STR_ERROR_PATH_IS_DISK_FALSE _("The selected directory is not located on the target device") diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 571c496..b112830 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -381,6 +381,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False False + True 450 True dialog-question-symbolic diff --git a/ubl-settings-diskquota.pot b/ubl-settings-diskquota.pot index ed07b6f..53cd85d 100644 --- a/ubl-settings-diskquota.pot +++ b/ubl-settings-diskquota.pot @@ -425,7 +425,7 @@ msgstr "" msgid "Project ID mandatory field" msgstr "" -msgid "The volume and files fields must have at least one value" +msgid "Insert at leat one value before saving" msgstr "" msgid "The path does not match the specified disk" diff --git a/ubl-settings-diskquota_ru.po b/ubl-settings-diskquota_ru.po index 1d56a7a..58d303f 100644 --- a/ubl-settings-diskquota_ru.po +++ b/ubl-settings-diskquota_ru.po @@ -433,8 +433,8 @@ msgstr "Имя проекта обязательное поле" msgid "Project ID mandatory field" msgstr "ID проекта обязательное поле" -msgid "The volume and files fields must have at least one value" -msgstr "Поля объем и файлы должно быть указано хотя бы одно значение" +msgid "Insert at leat one value before saving" +msgstr "Необходимо ввести хотя бы одно значение перед сохранением" msgid "The path does not match the specified disk" msgstr "Путь не соответствует указанному диску" From 0dbeb71580dfaae00c4cd08b1086baca4777a363 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 8 Aug 2023 18:02:45 +0600 Subject: [PATCH 07/10] Fixed different margins for add checkbox --- ubl-settings-diskquota.glade | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index b112830..c7419f0 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -552,6 +552,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False value-increase-symbolic + + True + False + emblem-synchronizing-symbolic + True False @@ -599,6 +604,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 5 5 Device: + 0 False @@ -1161,8 +1167,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False 5 5 - 5 - 5 right True @@ -1248,8 +1252,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False 5 5 - 5 - 5 right True @@ -1635,6 +1637,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + + + + + True False @@ -4010,6 +4018,26 @@ for exceeding files 2 + + + Update + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + image13 + + + False + True + 3 + + False From 4c0d6c689b70ecd9dc2c95463bd41daa77af63a5 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 9 Aug 2023 10:43:22 +0600 Subject: [PATCH 08/10] Fixed user's ability to choose disk space quotas more than avaliable --- source/view_temp_u_g_p.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/view_temp_u_g_p.c b/source/view_temp_u_g_p.c index a296659..cefd227 100644 --- a/source/view_temp_u_g_p.c +++ b/source/view_temp_u_g_p.c @@ -339,6 +339,10 @@ void update_max_size_spin(GtkWidget *self, int* flag) { for (int i = 0; i < get_device_vec()->vectorList.total; i++) { device_config* _config = (device_config*)get_device_vec()->pfVectorGet(get_device_vec(), i); if (strstr(str_disk, _config->name_disk)) { + if (self==temp_widgets->quotegroupSizeSoftLimitCombo) + gtk_spin_button_set_value(GTK_SPIN_BUTTON(temp_widgets->quotegroupSizeSoftLimitSpin),0.0); + else if (self==temp_widgets->quotegroupSizeHardLimitCombo) + gtk_spin_button_set_value(GTK_SPIN_BUTTON(temp_widgets->quotegroupSizeHardLimitSpin),0.0); philos_set_spin_adjustment(temp_widgets->quotegroupSizeSoftLimitCheck, temp_widgets->quotegroupSizeSoftLimitSpin, temp_widgets->quotegroupSizeSoftLimitCombo, _config->size_disk); From 9f9f92f1028e58c1442001bc3f9df7d5107b93b2 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 9 Aug 2023 11:08:05 +0600 Subject: [PATCH 09/10] Localisation edits --- source/ubl-strings.h | 7 +- ubl-settings-diskquota.glade | 1 + ubl-settings-diskquota.pot | 349 +++++++++++------------------------ ubl-settings-diskquota_ru.po | 14 +- 4 files changed, 127 insertions(+), 244 deletions(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index c1d50aa..b786276 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -96,6 +96,7 @@ #define STR_ERROR_ENTRY_VALUE_VOLUME_OR_FILES _("Insert at leat one value before saving") #define STR_ERROR_PATH_IS_DISK_FALSE _("The selected directory is not located on the target device") - - - +#define ADD_LABEL _("Add") +#define UPDATE_LABEL _("Update") +#define CANCEL_LABEL _("Cancel") +#define SAVE_LABEL _("Save") diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index c7419f0..b8d87fd 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -499,6 +499,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True True + end image1