From 02d3e71bcc94da131ef0b2474717241b3b405e0b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 3 Nov 2023 09:55:47 +0600 Subject: [PATCH] Name entry at add window --- source/ubl-settings-logging.c | 36 ++++----- source/ubl-settings-logging.h | 23 +----- source/ubl-strings.h | 3 +- ubl-settings-logging-add.glade | 23 ++++++ ubl-settings-logging-logrotate-table.glade | 86 +++++++++++----------- ubl-settings-logging.css | 3 + ubl-settings-logging.pot | 4 + ubl-settings-logging_ru.po | 8 +- 8 files changed, 98 insertions(+), 88 deletions(-) diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c index fde2c56..5862f99 100644 --- a/source/ubl-settings-logging.c +++ b/source/ubl-settings-logging.c @@ -320,23 +320,6 @@ void on_inspector_open(GtkWidget *self, main_window *widgets){ } } -void on_log_choose(GtkWidget *self,add_log_window *window){ - GtkWidget *dialog = gtk_file_chooser_dialog_new(TITLE_LABEL,GTK_WINDOW(window->MainWindow),GTK_FILE_CHOOSER_ACTION_OPEN,CANCEL_LABEL,GTK_RESPONSE_CANCEL,ACCEPT_LABEL,GTK_RESPONSE_ACCEPT,NULL); - gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog),yon_ubl_user_get_home_directory(),NULL); - gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog),"/var/",NULL); - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),"/var/"); - GtkFileFilter *filter = gtk_file_filter_new(); - gtk_file_filter_add_pattern(filter,"*.log"); - gtk_file_filter_set_name(filter,".log"); - gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),filter); - int responce = gtk_dialog_run(GTK_DIALOG(dialog)); - if (responce == GTK_RESPONSE_ACCEPT){ - char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - gtk_entry_set_text(GTK_ENTRY(window->LogPathEntry),filename); - } - gtk_widget_destroy(dialog); -} - // Logrotate window void on_logrotate_configuration_path_add(GtkWidget *self, logrotate_configure_window *window){ @@ -1592,9 +1575,12 @@ void on_log_save(GtkWidget *self, dictionary *dict){ pathse=yon_char_unite(pathse ? yon_char_append(pathse,"\n"):"",gtk_entry_get_text((GtkEntry*)g_list_nth_data(paths,1)),NULL); } GtkTreeIter iter; - - gtk_list_store_append(widgets->list,&iter); - gtk_list_store_set(widgets->list,&iter,1,pathse,-1); + char *name = (char*)gtk_entry_get_text(GTK_ENTRY(window->NameEntry)); + char *desc = (char*)gtk_entry_get_text(GTK_ENTRY(window->LogDescriptionEntry)); + if (!yon_char_is_empty(name)){ + gtk_list_store_append(widgets->list,&iter); + gtk_list_store_set(widgets->list,&iter,0,name,1,pathse,2,&desc ? desc : "",-1); + } on_close_subwindow(self); } @@ -1604,10 +1590,7 @@ add_log_window *on_add_open(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->LogAddingBox=yon_gtk_builder_get_widget(builder,"LogAddingBox"); window->LogTypeCombo=yon_gtk_builder_get_widget(builder,"LogTypeCombo"); - window->LogPathEntry=yon_gtk_builder_get_widget(builder,"LogPathEntry"); - window->LogFindButton=yon_gtk_builder_get_widget(builder,"LogFindButton"); window->LogDescriptionEntry=yon_gtk_builder_get_widget(builder,"LogDescriptionEntry"); window->LogrotateButton=yon_gtk_builder_get_widget(builder,"LogrotateButton"); window->MetalogButton=yon_gtk_builder_get_widget(builder,"MetalogButton"); @@ -1617,6 +1600,7 @@ add_log_window *on_add_open(main_window *widgets){ window->StatisticsFrame=yon_gtk_builder_get_widget(builder,"StatisticsFrame"); window->ControlSectionBox=yon_gtk_builder_get_widget(builder,"ControlSectionBox"); window->LogPathsBox=yon_gtk_builder_get_widget(builder,"LogPathsBox"); + window->NameEntry=yon_gtk_builder_get_widget(builder,"NameEntry"); gtk_window_set_title(GTK_WINDOW(window->MainWindow),TITLE_LABEL); gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window)); dictionary *dict = NULL; @@ -1708,6 +1692,12 @@ void on_log_edit(GtkWidget *self,main_window *widgets){ int size; char *description; gtk_tree_model_get(model,&iter,0,&name,1,&paths,2,&description,-1); + gtk_entry_set_text(GTK_ENTRY(window->NameEntry),name); + gtk_entry_set_has_frame(GTK_ENTRY(window->NameEntry),0); + gtk_widget_set_sensitive(window->NameEntry,0); + gtk_style_context_add_class(gtk_widget_get_style_context(window->NameEntry),"nobackground"); + gtk_style_context_add_class(gtk_widget_get_style_context(window->NameEntry),"noborder"); + gtk_style_context_add_class(gtk_widget_get_style_context(window->NameEntry),"instant"); if (!strcmp(name,"journald")){ gtk_widget_hide(window->LogrotateButton); gtk_widget_hide(window->MetalogButton); diff --git a/source/ubl-settings-logging.h b/source/ubl-settings-logging.h index cb08dd8..40d6e31 100644 --- a/source/ubl-settings-logging.h +++ b/source/ubl-settings-logging.h @@ -159,31 +159,9 @@ typedef struct { GtkWidget *CancelButton; GtkWidget *SaveButton; GtkWidget *LogTypeCombo; - GtkWidget *LogPathEntry; - GtkWidget *LogFindButton; GtkWidget *LogDescriptionEntry; GtkWidget *editingBox; - GtkWidget *FileAmountCheck; - GtkWidget *FileAmountSpin; - GtkWidget *FileSizeCheck; - GtkWidget *FileSizeSpin; - GtkWidget *FileSizeCombo; - GtkWidget *RotationPeriodCheck; - GtkWidget *RotationPeriodCombo; - GtkWidget *JournalSizeCheck; - GtkWidget *JournalSizeSpin; - GtkWidget *JournalSizeCombo; - GtkWidget *JournalGatheringPeriodCheck; - GtkWidget *JournalGatheringPeriodCombo; GtkWidget *logSizeLabel; - GtkWidget *diskSizeLabel; - GtkWidget *headerBar; - GtkWidget *headerTopic; - GtkWidget *LogSettingsBox; - GtkWidget *JournalSettingsBox; - GtkWidget *LogEditingBox; - GtkWidget *LogAddingBox; - GtkWidget *LogNameLabel; GtkWidget *LogrotateButton; GtkWidget *MetalogButton; GtkWidget *SyslogButton; @@ -192,6 +170,7 @@ typedef struct { GtkWidget *StatisticsFrame; GtkWidget *ControlSectionBox; GtkWidget *LogPathsBox; + GtkWidget *NameEntry; char *log_name; } add_log_window; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 5958340..7f17272 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -182,4 +182,5 @@ //ubl-settings-logging-add.glade #define ADD_PATHS_LABEL _("Path (-s):") #define CONTROL_LABEL _("Control:") -#define LOG_LABEL _("Log file") \ No newline at end of file +#define LOG_LABEL _("Log file") +#define NAME_LABEL _("Name:") \ No newline at end of file diff --git a/ubl-settings-logging-add.glade b/ubl-settings-logging-add.glade index e9a1efe..a440c54 100644 --- a/ubl-settings-logging-add.glade +++ b/ubl-settings-logging-add.glade @@ -150,6 +150,29 @@ 1 + + + True + False + Name: + + + False + True + 2 + + + + + True + True + + + False + True + 3 + + False diff --git a/ubl-settings-logging-logrotate-table.glade b/ubl-settings-logging-logrotate-table.glade index b02c0fa..e045a71 100644 --- a/ubl-settings-logging-logrotate-table.glade +++ b/ubl-settings-logging-logrotate-table.glade @@ -49,15 +49,16 @@ False com.ublinux.ubl-settings-logging.back-symbolic - + 450 450 False True com.ublinux.ubl-settings-logging dialog - + + True False 5 5 @@ -65,45 +66,6 @@ 5 vertical 5 - - - False - end - - - Cancel - True - True - True - image1 - - - True - True - 0 - - - - - Save - True - True - True - image2 - - - True - True - 1 - - - - - False - False - 2 - - True @@ -354,6 +316,48 @@ 0 + + + True + False + end + 5 + True + + + Cancel + True + True + True + image1 + + + False + True + 0 + + + + + Save + True + True + True + image2 + + + False + True + 1 + + + + + False + True + 1 + + diff --git a/ubl-settings-logging.css b/ubl-settings-logging.css index 88e8c57..717c5c0 100644 --- a/ubl-settings-logging.css +++ b/ubl-settings-logging.css @@ -111,4 +111,7 @@ background:transparent; .boxInfoMessOK{ background-color: #f3f0ac; +} +.instant { + transition: 0ms; } \ No newline at end of file diff --git a/ubl-settings-logging.pot b/ubl-settings-logging.pot index d83eb82..1601a18 100644 --- a/ubl-settings-logging.pot +++ b/ubl-settings-logging.pot @@ -707,6 +707,10 @@ msgstr "" msgid "Log file" msgstr "" +#: source/ubl-strings.h:186 +msgid "Name:" +msgstr "" + msgid "System event log rotation service" msgstr "" diff --git a/ubl-settings-logging_ru.po b/ubl-settings-logging_ru.po index 0e94654..a6d2aa8 100644 --- a/ubl-settings-logging_ru.po +++ b/ubl-settings-logging_ru.po @@ -277,7 +277,9 @@ msgstr "Показать все загрузки в журнале" #: source/ubl-strings.h:65 msgid "Show a list of all units, ordered by the time of their initialisation" -msgstr "Показать список всех работающих юнитов, упорядоченных по времени их инициализации" +msgstr "" +"Показать список всех работающих юнитов, упорядоченных по времени их " +"инициализации" #: source/ubl-strings.h:66 msgid "Show tree of time-critical initialization unit chain" @@ -719,6 +721,10 @@ msgstr "Управление:" msgid "Log file" msgstr "Файл лога" +#: source/ubl-strings.h:186 +msgid "Name:" +msgstr "Имя:" + msgid "System event log rotation service" msgstr "Служба ротации системных журналов событий"