diff --git a/Makefile b/Makefile
index 7e06a54..1306447 100644
--- a/Makefile
+++ b/Makefile
@@ -139,6 +139,7 @@ install: check uninstall
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.trash-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.sort-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.sync-symbolic.svg"
+ @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.funnel-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.generic1-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "icons/com.ublinux.${PKGNAME}.generic2-symbolic.svg"
@@ -150,6 +151,7 @@ install: check uninstall
@install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/csv/" "journals_list.csv"
@install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/csv/" "logging_services.csv"
@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
+ @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.auth.policy"
@if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \
update-desktop-database --quiet &>/dev/null || true; \
diff --git a/icons/com.ublinux.ubl-settings-logging.funnel-symbolic.svg b/icons/com.ublinux.ubl-settings-logging.funnel-symbolic.svg
new file mode 100644
index 0000000..4aec04a
--- /dev/null
+++ b/icons/com.ublinux.ubl-settings-logging.funnel-symbolic.svg
@@ -0,0 +1,45 @@
+
+
+
+
diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index e2815aa..023f30c 100644
--- a/source/ubl-settings-logging.c
+++ b/source/ubl-settings-logging.c
@@ -690,6 +690,15 @@ void on_logrotate_save(GtkWidget *self, dictionary *dict){
return;
}
}
+ if (paths){
+ int psize=0;
+ config_str paths_parsed = yon_char_parse(paths,&psize,",");
+ if (yon_char_parsed_check_repeats(paths_parsed,psize)){
+ yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(window->LogPathsTree));
+ yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),REPEAT_PATHS_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+ return;
+ }
+ }
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->RotationPeriodCheck))){
int active = gtk_combo_box_get_active(GTK_COMBO_BOX(window->RotationPeriodMainCombo));
switch (active){
@@ -1370,6 +1379,36 @@ void yon_combo_compress_check(GtkComboBox *self, journald_window *window){
}
}
+void on_journald_reset(GtkWidget *self, journald_window *window){
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->LogStorageCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->LogCompressionCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->RedirectCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->LowerSizeCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->LowerTimeCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->LogStorageCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->LogFreeSpaceCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->ForwardedTypeCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->RotationSizeMaxCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->LogCompressionSizeCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->DivideJournalFilesCombo),0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(window->LogSizeMaxCombo),0);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->LogSizeMaxCheck),0);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->LogIntervalCheck),0);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->LogFreeSpaceCheck),0);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->RotationSizeMaxCheck),0);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->LogIntervalAmountCheck),0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->LogSizeMaxSpin),0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->LogIntervalSpin),0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->LogFreeSpaceSpin),0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->RotationSizeMaxSpin),0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->LogIntervalAmountSpin),0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->LogCompressionEntry),0);
+ gtk_entry_set_text(GTK_ENTRY(window->RedirectTTYEntry),"");
+
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->LowerSizeEntry),0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->LowerTimeEntry),0);
+}
+
void on_journald_save(GtkWidget *self, journald_window *window){
char *storage;
int storage_active = gtk_combo_box_get_active(GTK_COMBO_BOX(window->LogStorageCombo));
@@ -1503,6 +1542,7 @@ journald_window *yon_journald_open(GtkWidget *self, main_window *widgets){
window->MainWindow=yon_gtk_builder_get_widget(builder,"MainWindow");
window->CancelButton=yon_gtk_builder_get_widget(builder,"CancelButton");
window->SaveButton=yon_gtk_builder_get_widget(builder,"SaveButton");
+ window->ResetButton=yon_gtk_builder_get_widget(builder,"ResetButton");
window->LogNameLabel=yon_gtk_builder_get_widget(builder,"LogNameEntry");
window->LogDescriptionLabel=yon_gtk_builder_get_widget(builder,"LogDescriptionEntry");
window->LogStorageCombo=yon_gtk_builder_get_widget(builder,"LogStorageCombo");
@@ -1548,6 +1588,7 @@ journald_window *yon_journald_open(GtkWidget *self, main_window *widgets){
g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_close_subwindow),"JournaldWindow");
g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_journald_save),window);
+ g_signal_connect(G_OBJECT(window->ResetButton),"clicked",G_CALLBACK(on_journald_reset),window);
g_signal_connect(G_OBJECT(window->LogIntervalCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button),window->LogIntervalSpin);
g_signal_connect(G_OBJECT(window->LogIntervalCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button),window->LogIntervalAmountCheck);
@@ -1682,6 +1723,11 @@ void on_log_save(GtkWidget *self, dictionary *dict){
}
int paths_size=0;
config_str paths_parsed = yon_char_parse(paths,&paths_size,"\n");
+ if (yon_char_parsed_check_repeats(paths_parsed,paths_size)){
+ yon_ubl_status_highlight_incorrect(window->LogPathsBox);
+ yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),REPEAT_PATHS_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+ return;
+ }
int pathse_size=0;
config_str pathse_parsed = yon_char_parse(pathse,&pathse_size,"\n");
@@ -2200,7 +2246,9 @@ main_window *setup_window(){
config_str log = yon_char_parse(journals[i],&log_size,";");
log[1] = yon_char_replace(log[1],",","\n");
gtk_list_store_append(widgets->list,&iter);
- free(yon_char_parse(log[1],&psize,"\n"));
+ config_str sfafa = yon_char_parse(log[1],&psize,"\n");
+ if (sfafa)
+ free(sfafa);
gtk_list_store_set(widgets->list,&iter,0,log[0],1,log[1],2,_(log[2]),3,1,4,psize,-1);
}
config_str services = yon_file_open(services_list_path,&service_size);
diff --git a/source/ubl-settings-logging.h b/source/ubl-settings-logging.h
index 1d338de..a518e55 100644
--- a/source/ubl-settings-logging.h
+++ b/source/ubl-settings-logging.h
@@ -246,6 +246,7 @@ typedef struct {
GtkWidget *MainWindow;
GtkWidget *CancelButton;
GtkWidget *SaveButton;
+ GtkWidget *ResetButton;
GtkWidget *LogNameLabel;
GtkWidget *LogDescriptionLabel;
GtkWidget *LogStorageCombo;
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 2207240..06bf78e 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -101,6 +101,7 @@
#define DAYS_LABEL _("Days")
#define WEEKS_LABEL _("Weeks")
#define YEARS_LABEL _("Years")
+#define RESET_LABEL _("Reset")
//ubl-settings-logging-logrotate.glade
#define LOGROTATE_LOG_JOURNAL_TAB_LABEL _("Log/Journal:")
@@ -176,6 +177,7 @@
#define SUNDAY_LABEL _("Sunday*")
#define REPEATED_PATHS_LABEL _("Same record already exists")
#define EMPTY_IMPORTANT_LABEL _("Empty important field")
+#define REPEAT_PATHS_LABEL _("Repeating paths")
//ubl-settings-logging-logrotate-table.glade
#define SYSTEM_CONFIGURATION_LABEL _("System configuration")
diff --git a/ubl-settings-logging-filechooser.glade b/ubl-settings-logging-filechooser.glade
index 28ddce1..3d0a484 100644
--- a/ubl-settings-logging-filechooser.glade
+++ b/ubl-settings-logging-filechooser.glade
@@ -33,7 +33,6 @@
@@ -1048,4 +1062,9 @@
+
diff --git a/ubl-settings-logging-logrotate.glade b/ubl-settings-logging-logrotate.glade
index 2b13c77..23fbfb5 100644
--- a/ubl-settings-logging-logrotate.glade
+++ b/ubl-settings-logging-logrotate.glade
@@ -318,6 +318,9 @@
True
liststore1
False
+
+
+