From 43a295cf22a84428d8c18b59308b56a670425113 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 7 Apr 2023 15:52:34 +0600 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=D1=8B=20=D0=BA=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 2 ++ source/my_type.h | 11 +++++++++ source/project_lib.h | 42 +++++++++++++++++++++++++++++++++++ source/ubl-settings-quotas.cc | 14 ++++++++++-- source/ubl-settings-quotas.h | 6 ----- source/util.h | 23 +------------------ 6 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 source/my_type.h create mode 100644 source/project_lib.h diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index c4a700b..6449680 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -16,8 +16,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection -g") set(SOURCE_FILES + project_lib.h ubl-settings-quotas.h ubl-settings-quotas.cc + my_type.h save.h save.cc load.h diff --git a/source/my_type.h b/source/my_type.h new file mode 100644 index 0000000..7431181 --- /dev/null +++ b/source/my_type.h @@ -0,0 +1,11 @@ +#ifndef MY_TYPE_H +#define MY_TYPE_H + +#include +#include +typedef unsigned long max_num_T; + +tuple tuple_user_grups; + +#endif \ No newline at end of file diff --git a/source/project_lib.h b/source/project_lib.h new file mode 100644 index 0000000..907db55 --- /dev/null +++ b/source/project_lib.h @@ -0,0 +1,42 @@ +#ifndef PROJECT_LIB_H +#define PROJECT_LIB_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "ubl-util-standard.c" + +#endif \ No newline at end of file diff --git a/source/ubl-settings-quotas.cc b/source/ubl-settings-quotas.cc index ef9f7b8..665d2ae 100755 --- a/source/ubl-settings-quotas.cc +++ b/source/ubl-settings-quotas.cc @@ -177,11 +177,22 @@ void MainWindow::add_CSS() { boxButton_css->add_class("bkim_no_plug"); boxSave_css->add_class("bkim_no_plug"); } - headLabel_css->add_class("textHead"); } +/* +void init_treeview_user() { +} +void MainWindow::view_add_data(Gtk::TreeModel::Row &row, Glib::RefPtr list_store_m , std::array, 5> &arr_view , size_t index) { + row = *(list_store_m->append()); + bool flag_chb = false; + string name = arr_view[0][index]; + row[m_columns.check_button] = flag_chb; + row[m_columns.name] = _(name.c_str()); + row[m_columns.description] = _(arr_view[1][index].c_str()); +} +*/ void MainWindow::get_builder() { builder->set_translation_domain(path_app); @@ -293,7 +304,6 @@ void MainWindow::get_builder() { builder->get_widget("quoteuserFilesSoftLimitlabel", quoteuserFilesSoftLimitlabel); builder->get_widget("QuotasEditWindow", QuotasEditWindow); builder->get_widget("QuotasUserEditWindow", QuotasUserEditWindow); - } void MainWindow::event() { diff --git a/source/ubl-settings-quotas.h b/source/ubl-settings-quotas.h index a26f830..b953ff4 100644 --- a/source/ubl-settings-quotas.h +++ b/source/ubl-settings-quotas.h @@ -1,12 +1,6 @@ #ifndef UBL_SETTINGS_QUOTAS_H #define UBL_SETTINGS_QUOTAS_H -#include -#include -#include -#include -#include -#include "ubl-util-standard.c" #include "util.h" diff --git a/source/util.h b/source/util.h index 9044b95..603e9a3 100644 --- a/source/util.h +++ b/source/util.h @@ -1,27 +1,6 @@ #ifndef UTIL_H #define UTIL_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "project_lib.h" using namespace std;