diff --git a/Makefile b/Makefile
index ebf196f..abf1568 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ FILE_VERSION = VERSION.md
DEPENDS = /bin/cmake
PREFIX ?= /usr
PKGNAME = $(MAKEFILE_DIR)
-#PKGNAME = ubl-settings-datetime
+#PKGNAME = ubl-settings-diskquota
default_target: all
@@ -24,7 +24,7 @@ all: init build
init:
@echo "Initialize ..."; \
- sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-datetime.cc; \
+ sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-diskquota.cc; \
echo "-- Build path: ${CMAKE_BUILD_DIR}"
depend:
diff --git a/com.ublinux.pkexec.ubl-settings-quotas.exec.policy b/com.ublinux.pkexec.ubl-settings-diskquota.exec.policy
similarity index 100%
rename from com.ublinux.pkexec.ubl-settings-quotas.exec.policy
rename to com.ublinux.pkexec.ubl-settings-diskquota.exec.policy
diff --git a/com.ublinux.ubl-settings-quotas.checked.svg b/com.ublinux.ubl-settings-diskquota.checked.svg
similarity index 100%
rename from com.ublinux.ubl-settings-quotas.checked.svg
rename to com.ublinux.ubl-settings-diskquota.checked.svg
diff --git a/com.ublinux.ubl-settings-quotas.svg b/com.ublinux.ubl-settings-diskquota.svg
similarity index 100%
rename from com.ublinux.ubl-settings-quotas.svg
rename to com.ublinux.ubl-settings-diskquota.svg
diff --git a/com.ublinux.ubl-settings-quotas.warning.svg b/com.ublinux.ubl-settings-diskquota.warning.svg
similarity index 100%
rename from com.ublinux.ubl-settings-quotas.warning.svg
rename to com.ublinux.ubl-settings-diskquota.warning.svg
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 7c074b9..86480bb 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.7)
-project(ubl-settings-quotas)
+project(ubl-settings-diskquota)
find_package(PkgConfig REQUIRED)
@@ -16,8 +16,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin
-fstack-clash-protection -fcf-protection -g")
set(SOURCE_FILES
- ubl-settings-quotas.h
- ubl-settings-quotas.cc
+ ubl-settings-diskquota.h
+ ubl-settings-diskquota.cc
system_cmd_quotas.cc
system_cmd_quotas.h
my_device.h
@@ -42,6 +42,6 @@ set(LIBRARIES
${GTK_LIBRARIES}
pthread)
-add_executable(ubl-settings-quotas ${SOURCE_FILES})
-target_link_libraries(ubl-settings-quotas ${LIBRARIES} ${ICU_LIBRARIES})
-install(TARGETS ubl-settings-quotas DESTINATION bin)
\ No newline at end of file
+add_executable(ubl-settings-diskquota ${SOURCE_FILES})
+target_link_libraries(ubl-settings-diskquota ${LIBRARIES} ${ICU_LIBRARIES})
+install(TARGETS ubl-settings-diskquota DESTINATION bin)
\ No newline at end of file
diff --git a/source/main.cc b/source/main.cc
index 3426bf9..fc79f20 100644
--- a/source/main.cc
+++ b/source/main.cc
@@ -1,4 +1,4 @@
-#include "ubl-settings-quotas.h"
+#include "ubl-settings-diskquota.h"
#include "my_plug.h"
void pars_flag(int index_start, int argc, char* argv[]);
@@ -62,7 +62,7 @@ void pars_flag(int index_start, int argc, char* argv[]) {
exit(1);
}
else if (str_argv == "--version" || str_argv == "-v"){
- string version = string(_("ubl-settings-quotas version: ")) + version_application + "\n";
+ string version = string(_("ubl-settings-diskquota version: ")) + version_application + "\n";
cout << version.c_str();
exit(1);
}
diff --git a/source/my_plug.cc b/source/my_plug.cc
index 966d79b..ba95ed8 100644
--- a/source/my_plug.cc
+++ b/source/my_plug.cc
@@ -2,7 +2,7 @@
#define MY_PLUG_H
#include "my_plug.h"
-#include "ubl-settings-quotas.h"
+#include "ubl-settings-diskquota.h"
CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help)
: Glib::OptionGroup{p_name, p_description, p_help} {
diff --git a/source/ubl-settings-quotas.cc b/source/ubl-settings-diskquota.cc
similarity index 97%
rename from source/ubl-settings-quotas.cc
rename to source/ubl-settings-diskquota.cc
index da8eb3a..ec2b482 100755
--- a/source/ubl-settings-quotas.cc
+++ b/source/ubl-settings-diskquota.cc
@@ -1,13 +1,13 @@
-#include "ubl-settings-quotas.h"
+#include "ubl-settings-diskquota.h"
using namespace std;
const string path_app = "/usr/bin/";
-const string path_glade = "/usr/share/ubl-settings-quotas/ui/ubl-settings-quotas.glade";
-const string app_name = "ubl-settings-quotas";
+const string path_glade = "/usr/share/ubl-settings-diskquota/ui/ubl-settings-diskquota.glade";
+const string app_name = "ubl-settings-diskquota";
const string path_locale = "/usr/share/locale/";
-const string path_css = "/usr/share/ubl-settings-quotas/css/ubl-settings-quotas.css";
-const string path_img_head_background = "/usr/share/ubl-settings-quotas/images/logo-background.png";
+const string path_css = "/usr/share/ubl-settings-diskquota/css/ubl-settings-diskquota.css";
+const string path_img_head_background = "/usr/share/ubl-settings-diskquota/images/logo-background.png";
int socket_ext_id_I = 0;
int socket_trd_id_I = 0;
@@ -65,7 +65,7 @@ void MainWindow::settings() {
boxFuncs->set_sensitive(false);
btnSave->set_sensitive(false);
btnLoad->set_sensitive(false);
- imgInfo->set_from_icon_name("com.ublinux.ubl-settings-quotas.warning", Gtk::ICON_SIZE_MENU);
+ imgInfo->set_from_icon_name("com.ublinux.ubl-settings-diskquota.warning", Gtk::ICON_SIZE_MENU);
info_status_app("boxInfoMessError");
lblWarning->set_text(_("The program must be run as root"));
}
@@ -159,7 +159,7 @@ void MainWindow::lacalization() {
generalTabLabel->set_text(_("General settings"));
GroupsTabLabel->set_text(_("Groups"));
headerAboutTopic->set_label(_(app_name.c_str()));
- headerTopic->set_label(_("ubl-settings-quotas"));
+ headerTopic->set_label(_("ubl-settings-diskquota"));
UsersTabLabel->set_text(_("Users"));
generalDeviceLabel->set_text(_("Device:"));
generalFileSystemLabel->set_text(_("File system:"));
@@ -732,7 +732,7 @@ void MainWindow::load_template(map_str_str* map_temp, string str_load) {
void MainWindow::info_warning_error(int mess) {
if (obj_load.get_count_error() > 0 || obj_save.get_count_error() > 0) {
info_status_app("boxInfoMessError");
- imgInfo->set_from_icon_name("com.ublinux.ubl-settings-quotas.warning", Gtk::ICON_SIZE_MENU);
+ imgInfo->set_from_icon_name("com.ublinux.ubl-settings-diskquota.warning", Gtk::ICON_SIZE_MENU);
string mess_error = "";
if (mess == 0) {
mess_error = string(_("Local configuration reading error")) + str_cmd_error;
@@ -760,7 +760,7 @@ void MainWindow::info_warning_error(int mess) {
}
else {
info_status_app("boxInfoMessOK");
- imgInfo->set_from_icon_name("com.ublinux.ubl-settings-quotas.checked", Gtk::ICON_SIZE_MENU);
+ imgInfo->set_from_icon_name("com.ublinux.ubl-settings-diskquota.checked", Gtk::ICON_SIZE_MENU);
if (mess == 0) {
lblWarning->set_text(_("Local configuration downloaded successfully"));
}
@@ -783,11 +783,11 @@ void MainWindow::info_warning_error(int mess) {
}
void help() {
- string version = string(_("ubl-settings-quotas version: ")) + version_application + "\n";
+ string version = string(_("ubl-settings-diskquota version: ")) + version_application + "\n";
cout << version.c_str();
string help;
help = "GTK settings quotas. for UBLinux\n\n"
- "Usage: ubl-settings-quotas [OPTIONS...]\n"
+ "Usage: ubl-settings-diskquota [OPTIONS...]\n"
"Options:\n"
" -h, --help Show this help\n"
" -V, --version Show package version\n";
diff --git a/source/ubl-settings-quotas.h b/source/ubl-settings-diskquota.h
similarity index 100%
rename from source/ubl-settings-quotas.h
rename to source/ubl-settings-diskquota.h
diff --git a/ubl-settings-quotas.css b/ubl-settings-diskquota.css
similarity index 100%
rename from ubl-settings-quotas.css
rename to ubl-settings-diskquota.css
diff --git a/ubl-settings-quotas.desktop b/ubl-settings-diskquota.desktop
similarity index 51%
rename from ubl-settings-quotas.desktop
rename to ubl-settings-diskquota.desktop
index 61cc341..942002a 100644
--- a/ubl-settings-quotas.desktop
+++ b/ubl-settings-diskquota.desktop
@@ -1,14 +1,14 @@
[Desktop Entry]
Encoding=UTF-8
-Name=ubl-settings-quotas
+Name=ubl-settings-diskquota
Name[ru]=Настройки квот
-GenericName=ubl-settings-quotas
+GenericName=ubl-settings-diskquota
GenericName[ru]=Настройки квот
-Comment=ubl-settings-quotas
-Comment[ru]=Приложение для управления настройками квот
+Comment=Disk quota management and configuration application
+Comment[ru]=Приложение управление и настройка дисковых квот
Type=Application
-Exec=pkexec ubl-settings-quotas
-Icon=com.ublinux.ubl-settings-quotas
+Exec=pkexec ubl-settings-diskquota
+Icon=com.ublinux.ubl-settings-diskquota
Terminal=false
X-XfcePluggable=true
X-UBLPluggable=true
diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade
new file mode 100644
index 0000000..5cb60aa
--- /dev/null
+++ b/ubl-settings-diskquota.glade
@@ -0,0 +1,3527 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ubl-settings-quotas.glade b/ubl-settings-diskquota.glade~
similarity index 100%
rename from ubl-settings-quotas.glade
rename to ubl-settings-diskquota.glade~
index 2e6b382..a908617 100644
--- a/ubl-settings-quotas.glade
+++ b/ubl-settings-diskquota.glade~
@@ -1808,7 +1808,7 @@
-
-