Applications
/
ubl-settings-logging
8
0
Fork 1
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Name entry at add window

Browse Source
pull/46/head
Ivan Dmitrievich Yartsev 3 years ago
parent 8e60c973fb
commit 02d3e71bcc
8 changed files with 98 additions and 88 deletions
Show Stats Download Patch File Download Diff File

36
source/ubl-settings-logging.c
Unescape View File

@ -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 // Logrotate window
void on_logrotate_configuration_path_add(GtkWidget *self, logrotate_configure_window *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); pathse=yon_char_unite(pathse ? yon_char_append(pathse,"\n"):"",gtk_entry_get_text((GtkEntry*)g_list_nth_data(paths,1)),NULL);
} }
GtkTreeIter iter; GtkTreeIter iter;
char *name = (char*)gtk_entry_get_text(GTK_ENTRY(window->NameEntry));
gtk_list_store_append(widgets->list,&iter); char *desc = (char*)gtk_entry_get_text(GTK_ENTRY(window->LogDescriptionEntry));
gtk_list_store_set(widgets->list,&iter,1,pathse,-1); 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); 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->MainWindow=yon_gtk_builder_get_widget(builder,"MainWindow");
window->CancelButton=yon_gtk_builder_get_widget(builder,"CancelButton"); window->CancelButton=yon_gtk_builder_get_widget(builder,"CancelButton");
window->SaveButton=yon_gtk_builder_get_widget(builder,"SaveButton"); 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->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->LogDescriptionEntry=yon_gtk_builder_get_widget(builder,"LogDescriptionEntry");
window->LogrotateButton=yon_gtk_builder_get_widget(builder,"LogrotateButton"); window->LogrotateButton=yon_gtk_builder_get_widget(builder,"LogrotateButton");
window->MetalogButton=yon_gtk_builder_get_widget(builder,"MetalogButton"); 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->StatisticsFrame=yon_gtk_builder_get_widget(builder,"StatisticsFrame");
window->ControlSectionBox=yon_gtk_builder_get_widget(builder,"ControlSectionBox"); window->ControlSectionBox=yon_gtk_builder_get_widget(builder,"ControlSectionBox");
window->LogPathsBox=yon_gtk_builder_get_widget(builder,"LogPathsBox"); 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_title(GTK_WINDOW(window->MainWindow),TITLE_LABEL);
gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window)); gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window));
dictionary *dict = NULL; dictionary *dict = NULL;
@ -1708,6 +1692,12 @@ void on_log_edit(GtkWidget *self,main_window *widgets){
int size; int size;
char *description; char *description;
gtk_tree_model_get(model,&iter,0,&name,1,&paths,2,&description,-1); 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")){ if (!strcmp(name,"journald")){
gtk_widget_hide(window->LogrotateButton); gtk_widget_hide(window->LogrotateButton);
gtk_widget_hide(window->MetalogButton); gtk_widget_hide(window->MetalogButton);

23
source/ubl-settings-logging.h
Unescape View File

@ -159,31 +159,9 @@ typedef struct {
GtkWidget *CancelButton; GtkWidget *CancelButton;
GtkWidget *SaveButton; GtkWidget *SaveButton;
GtkWidget *LogTypeCombo; GtkWidget *LogTypeCombo;
GtkWidget *LogPathEntry;
GtkWidget *LogFindButton;
GtkWidget *LogDescriptionEntry; GtkWidget *LogDescriptionEntry;
GtkWidget *editingBox; 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 *logSizeLabel;
GtkWidget *diskSizeLabel;
GtkWidget *headerBar;
GtkWidget *headerTopic;
GtkWidget *LogSettingsBox;
GtkWidget *JournalSettingsBox;
GtkWidget *LogEditingBox;
GtkWidget *LogAddingBox;
GtkWidget *LogNameLabel;
GtkWidget *LogrotateButton; GtkWidget *LogrotateButton;
GtkWidget *MetalogButton; GtkWidget *MetalogButton;
GtkWidget *SyslogButton; GtkWidget *SyslogButton;
@ -192,6 +170,7 @@ typedef struct {
GtkWidget *StatisticsFrame; GtkWidget *StatisticsFrame;
GtkWidget *ControlSectionBox; GtkWidget *ControlSectionBox;
GtkWidget *LogPathsBox; GtkWidget *LogPathsBox;
GtkWidget *NameEntry;
char *log_name; char *log_name;
} add_log_window; } add_log_window;

3
source/ubl-strings.h
Unescape View File

@ -182,4 +182,5 @@
//ubl-settings-logging-add.glade //ubl-settings-logging-add.glade
#define ADD_PATHS_LABEL _("Path (-s):") #define ADD_PATHS_LABEL _("Path (-s):")
#define CONTROL_LABEL _("Control:") #define CONTROL_LABEL _("Control:")
#define LOG_LABEL _("Log file") #define LOG_LABEL _("Log file")
#define NAME_LABEL _("Name:")

23
ubl-settings-logging-add.glade
Unescape View File

@ -150,6 +150,29 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Name:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="NameEntry">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

86
ubl-settings-logging-logrotate-table.glade
Unescape View File

@ -49,15 +49,16 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">com.ublinux.ubl-settings-logging.back-symbolic</property> <property name="icon-name">com.ublinux.ubl-settings-logging.back-symbolic</property>
</object> </object>
<object class="GtkDialog" id="MainWindow"> <object class="GtkWindow" id="MainWindow">
<property name="width-request">450</property> <property name="width-request">450</property>
<property name="height-request">450</property> <property name="height-request">450</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="modal">True</property> <property name="modal">True</property>
<property name="icon-name">com.ublinux.ubl-settings-logging</property> <property name="icon-name">com.ublinux.ubl-settings-logging</property>
<property name="type-hint">dialog</property> <property name="type-hint">dialog</property>
<child internal-child="vbox"> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
@ -65,45 +66,6 @@
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can-focus">False</property>
<property name="layout-style">end</property>
<child>
<object class="GtkButton" id="CancelButton">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image1</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="SaveButton">
<property name="label" translatable="yes">Save</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image2</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child> <child>
<object class="GtkNotebook"> <object class="GtkNotebook">
<property name="visible">True</property> <property name="visible">True</property>
@ -354,6 +316,48 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="spacing">5</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="CancelButton">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="SaveButton">
<property name="label" translatable="yes">Save</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="image">image2</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
</child> </child>
<child type="titlebar"> <child type="titlebar">

3
ubl-settings-logging.css
Unescape View File

@ -111,4 +111,7 @@ background:transparent;
.boxInfoMessOK{ .boxInfoMessOK{
background-color: #f3f0ac; background-color: #f3f0ac;
}
.instant {
transition: 0ms;
} }

4
ubl-settings-logging.pot
Unescape View File

@ -707,6 +707,10 @@ msgstr ""
msgid "Log file" msgid "Log file"
msgstr "" msgstr ""
#: source/ubl-strings.h:186
msgid "Name:"
msgstr ""
msgid "System event log rotation service" msgid "System event log rotation service"
msgstr "" msgstr ""

8
ubl-settings-logging_ru.po
Unescape View File

@ -277,7 +277,9 @@ msgstr "Показать все загрузки в журнале"
#: source/ubl-strings.h:65 #: source/ubl-strings.h:65
msgid "Show a list of all units, ordered by the time of their initialisation" msgid "Show a list of all units, ordered by the time of their initialisation"
msgstr "Показать список всех работающих юнитов, упорядоченных по времени их инициализации" msgstr ""
"Показать список всех работающих юнитов, упорядоченных по времени их "
"инициализации"
#: source/ubl-strings.h:66 #: source/ubl-strings.h:66
msgid "Show tree of time-critical initialization unit chain" msgid "Show tree of time-critical initialization unit chain"
@ -719,6 +721,10 @@ msgstr "Управление:"
msgid "Log file" msgid "Log file"
msgstr "Файл лога" msgstr "Файл лога"
#: source/ubl-strings.h:186
msgid "Name:"
msgstr "Имя:"
msgid "System event log rotation service" msgid "System event log rotation service"
msgstr "Служба ротации системных журналов событий" msgstr "Служба ротации системных журналов событий"

Write Preview
Loading…
Cancel
Save