Applications
/
ubl-settings-diskquota
10
0
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'master' (#90) from YanTheKaller/ubl-settings-diskquota:master into master

Browse Source 
Reviewed-on: #90
pull/92/head^2 v2.3
Dmitry Razumov 2 years ago
parent e0d1319b99 52179825f2
commit dcdf515c38
5 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File

13
Makefile
Unescape View File

@ -30,7 +30,7 @@ init:
else \ else \
LATEST_TAG="Development"; \ LATEST_TAG="Development"; \
fi; \ fi; \
sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \ sed -r "s/^(static string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \
echo "-- Build path: ${CMAKE_BUILD_DIR}" echo "-- Build path: ${CMAKE_BUILD_DIR}"
depend: depend:
@ -70,7 +70,7 @@ check:
build: depend prepare build: depend prepare
@echo "Build ..."; \ @echo "Build ..."; \
$(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \ $(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \
sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \ sed -r "s/^(static string version_application).*/\1;/" -i ${FILE_VER}; \
echo "Build: OK" echo "Build: OK"
uninstall: uninstall:
@ -115,10 +115,11 @@ install: check uninstall
install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ 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"; \ 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 done
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}/usr/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/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.funnel-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.zoom-symbolic.svg"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
@install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"

1
source/controler.c
Unescape View File

@ -574,7 +574,6 @@ int main(int argc, char *argv[]){
filters_init_flag(); filters_init_flag();
control_event(widgets, &cfg_custom_gui); control_event(widgets, &cfg_custom_gui);
yon_ubl_header_setup_resource(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path); yon_ubl_header_setup_resource(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path);
yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel); yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel);

6
source/model/load.c
Unescape View File

@ -26,7 +26,7 @@ void load_template_load_cfg(config_all* _all_config, char* cmd) {
if (strstr(device, _config_disk->name_disk)) { if (strstr(device, _config_disk->name_disk)) {
size_t deferring_size = 0; size_t deferring_size = 0;
size_t deferring_file = 0; size_t deferring_file = 0;
disk_status* disk_cfg = malloc(sizeof(disk_status)); disk_status* disk_cfg = g_malloc0(sizeof(disk_status));
disk_cfg->status = 1; disk_cfg->status = 1;
_all_config->v_disk_status.pfVectorAdd(&_all_config->v_disk_status, disk_cfg); _all_config->v_disk_status.pfVectorAdd(&_all_config->v_disk_status, disk_cfg);
disk_cfg->device = yon_char_new(device); disk_cfg->device = yon_char_new(device);
@ -63,7 +63,7 @@ void load_template_load_cfg(config_all* _all_config, char* cmd) {
} }
} }
if (((strstr(str_value, "enable") || strstr(str_value, "disable")) || yon_char_find_count(str_key, ":") == 1) && flag_find == 0) { if (((strstr(str_value, "enable") || strstr(str_value, "disable")) || yon_char_find_count(str_key, ":") == 1) && flag_find == 0) {
disk_status* disk_cfg = malloc(sizeof(disk_status)); disk_status* disk_cfg = g_malloc0(sizeof(disk_status));
disk_cfg->deferring_size = 0; disk_cfg->deferring_size = 0;
disk_cfg->deferring_file = 0; disk_cfg->deferring_file = 0;
load_pars_values_status(disk_cfg, str_key, str_value); load_pars_values_status(disk_cfg, str_key, str_value);
@ -101,7 +101,7 @@ void load_template_load_cfg(config_all* _all_config, char* cmd) {
} }
else { else {
config_u_g_p* _config = malloc(sizeof(config_u_g_p)); config_u_g_p* _config = g_malloc0(sizeof(config_u_g_p));
model_null_str_writing(_config); model_null_str_writing(_config);
_config->loaded_keys = yon_char_new(str_key); _config->loaded_keys = yon_char_new(str_key);
load_pars_keys(_config, yon_char_new(str_key), index); load_pars_keys(_config, yon_char_new(str_key), index);

3
source/view_temp_u_g_p.c
Unescape View File

@ -97,6 +97,7 @@ void temp_check_path() {
if (strstr(str_disk, _config->device)) { if (strstr(str_disk, _config->device)) {
const char* str_path = gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryCatalogProject)); const char* str_path = gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryCatalogProject));
if (strstr(str_path,_config->mount_point)) { if (strstr(str_path,_config->mount_point)) {
gtk_widget_set_sensitive(temp_widgets->btnSaveTempSave, 1);
} }
else { else {
gtk_widget_set_sensitive(temp_widgets->btnSaveTempSave, 0); gtk_widget_set_sensitive(temp_widgets->btnSaveTempSave, 0);
@ -601,7 +602,7 @@ int check_save() {
char* value3 = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->quotegroupFilesSoftLimitSpin)); char* value3 = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->quotegroupFilesSoftLimitSpin));
char* value4 = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->quotegroupFilesHardLimitSpin)); char* value4 = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->quotegroupFilesHardLimitSpin));
int menu_id = 0; int menu_id = 0;
if (strcmp(gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryUser)),"")==0){ if (strcmp(gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryUser)),"")==0&&!strstr(flag_temp_u_g_p,"prjquota")){
show_warning_no_fill(STR_ERROR_LIST_USER_NULL); show_warning_no_fill(STR_ERROR_LIST_USER_NULL);
return 0; return 0;
} }

16
ubl-settings-diskquota.glade
Unescape View File

@ -94,6 +94,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="valign">center</property> <property name="valign">center</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="width-request">90</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -637,11 +638,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<object class="GtkBox" id="boxTempDevice"> <object class="GtkBox" id="boxTempDevice">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkLabel" id="lblSetDevice"> <object class="GtkLabel" id="lblSetDevice">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Device:</property> <property name="label" translatable="yes">Device:</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
@ -662,6 +663,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="lblSetNameDevice">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -2721,6 +2733,8 @@ translated and supported by community.</property>
</object> </object>
<object class="GtkWindow" id="tableUserGroupWindow"> <object class="GtkWindow" id="tableUserGroupWindow">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="default-width">250</property> <property name="default-width">250</property>
<property name="default-height">400</property> <property name="default-height">400</property>
<property name="icon-name">com.ublinux.ubl-settings-diskquota</property> <property name="icon-name">com.ublinux.ubl-settings-diskquota</property>

Write Preview
Loading…
Cancel
Save