Changed error text for unfound files at inspector window

source/ubl-settings-logging.c

@@ -307,23 +307,34 @@ void on_inspector_update(GtkWidget *self, inspector_window *window){
     
 }
 
-GtkWidget *yon_inspector_add_terminal(inspector_window *window,char *page_name){
+GtkWidget *yon_inspector_add_terminal(inspector_window *window,char *page_name,int mode){
     GtkBuilder *builder = gtk_builder_new_from_resource(glade_terminal_path);
     GtkWidget *box = yon_gtk_builder_get_widget(builder,"TerminalBox");
     GtkWidget *terminal = yon_gtk_builder_get_widget(builder,"LoggingTerminal");
+    GtkWidget *unfound_label = yon_gtk_builder_get_widget(builder,"UnfoundLabel");
     GtkWidget *label = gtk_label_new(page_name);
     gtk_notebook_append_page(GTK_NOTEBOOK(window->LoggingNotebook),box,label);
+    if (mode){
         GdkRGBA rgba;
         rgba.alpha=1;
         rgba.red=0.95; 
         rgba.green=0.95;
         rgba.blue=0.95;
+        vte_terminal_set_color_cursor(VTE_TERMINAL(terminal),&rgba);
         vte_terminal_set_color_background(VTE_TERMINAL(terminal),&rgba);
         rgba.red=0;
         rgba.green=0;
         rgba.blue=0;
         vte_terminal_set_color_foreground(VTE_TERMINAL(terminal),&rgba);
         return terminal;
+    } else {
+        gtk_widget_destroy(terminal);
+        gtk_widget_show(unfound_label);
+        char *label_text = yon_char_append(page_name,PATH_NOT_FOUND_LABEL);
+        gtk_label_set_text(GTK_LABEL(unfound_label),label_text);
+        return NULL;
+    }
+    
 }
 
 void on_inspector_open(GtkWidget *self, main_window *widgets){
@@ -364,13 +375,19 @@ void on_inspector_open(GtkWidget *self, main_window *widgets){
         if (strcmp(name,"journald")){
             window->last_mode=-1;
             for (int i=0;i<window->journal_size;i++){
-                if (!access(window->journal_paths[i],F_OK)||!window->terminals)
-                    yon_dictionary_add_or_create_if_exists_with_data(window->terminals,window->journal_paths[i],yon_inspector_add_terminal(window,window->journal_paths[i]));
+                if (!access(window->journal_paths[i],F_OK)){
+                        yon_dictionary_add_or_create_if_exists_with_data(window->terminals,window->journal_paths[i],yon_inspector_add_terminal(window,window->journal_paths[i],1));
+                }
+                else{
+                    GtkWidget *terminal = yon_inspector_add_terminal(window,window->journal_paths[i],0);
+                    if (terminal)
+                        yon_dictionary_add_or_create_if_exists_with_data(window->terminals,window->journal_paths[i],terminal);
+                }
             }
             gtk_widget_hide(window->JournalActionsBox);
         } else {
             window->last_mode=0;
-            yon_dictionary_add_or_create_if_exists_with_data(window->terminals,"Journald",yon_inspector_add_terminal(window,"Journald"));
+                yon_dictionary_add_or_create_if_exists_with_data(window->terminals,"Journald",yon_inspector_add_terminal(window,"Journald",1));
         }
 
         on_inspector_update(window->UpdateButton,window);
@@ -2365,6 +2382,9 @@ main_window *setup_window(){
             }
         }
     } else {
+        if (access(custom_logs_saving_file_path,F_OK)){
+            yon_file_create_full_path(custom_logs_saving_file_path,0777);
+        }
         FILE *fl = fopen(custom_logs_saving_file_path,"w");
         fclose(fl);
     }
@@ -2424,7 +2444,7 @@ int main(int argc, char *argv[], char **envp){
                 { NULL, 0, NULL, 0 }
         };
         for (int i=0;i<argc;i++){
-            int argument=getopt_long(argc,argv,"hVvs:e:t:",long_options,&option_index);
+            int argument=getopt_long(argc,argv,"hVvs:e:t:c",long_options,&option_index);
             switch(argument){
                 case 'h':
                     show_help=1;
@@ -2447,6 +2467,7 @@ int main(int argc, char *argv[], char **envp){
                         main_config.load_socket_id=atoi(optarg);
                     break;
                 case 'c': system(yon_char_unite("rm -rfd ", yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",NULL));
+                    mkdir(yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",NULL),0777);
                     break;
                 case 1:
                     main_config.lock_help=1;
@@ -2473,9 +2494,9 @@ int main(int argc, char *argv[], char **envp){
     }
     
     if (getuid()!=0){
-        // main_config.lock_load_global=1;
-        // main_config.lock_save_global=1;
-        // main_config.lock_save_local=1;
+        main_config.lock_load_global=1;
+        main_config.lock_save_global=1;
+        main_config.lock_save_local=1;
     }
     gtk_init(&argc,&argv);
     

source/ubl-strings.h

@@ -197,3 +197,6 @@
 #define WRITE_LABEL _("Write")
 #define EXECUTE_LABEL _("Execute")
 #define VALUE_LABEL _("Value:")
+
+//ubl-settings-logging-terminal.glade
+#define PATH_NOT_FOUND_LABEL _(": no such file(s)")

source/ubl-utils.c

@@ -1535,6 +1535,59 @@ config_str yon_file_open(char *file_path, int *size){
     }
 }
 
+/**yon_file_create(char *path, char *name, int rules)
+ * [EN]
+ * 
+ * [RU]
+ * Создать файл с названием [name], находящимся по пути [path]
+ * С правами доступа [rules] (от 0000 до 0777)
+*/
+int yon_file_create(char *path, char *name, int rules){
+    if (path&&name){
+        char *full_path = yon_char_unite(path,"/",name,NULL);
+        if (access(full_path,F_OK)){
+            FILE *fl = fopen(full_path,"w");
+            if (fl){
+                chmod(full_path,rules);
+                fclose(fl);
+                return 1;
+            } else {
+                return 0;
+            }
+        } else {
+            return -1;
+        }
+    } else {
+        return 0;
+    }
+}
+
+/**yon_file_create_full_path(char *path, char *name, int rules)
+ * [EN]
+ * 
+ * [RU]
+ * Создать файл по пути [path]
+ * С правами доступа [rules] (от 0000 до 0777)
+*/
+int yon_file_create_full_path(char *path, int rules){
+    if (path){
+        if (access(path,F_OK)){
+            FILE *fl = fopen(path,"w");
+            if (fl){
+                chmod(path,rules);
+                fclose(fl);
+                return 1;
+            } else {
+                return 0;
+            }
+        } else {
+            return -1;
+        }
+    } else {
+        return 0;
+    }
+}
+
 // terminal-using functions
 
 /**yon_launch_app_with_arguments(char *name, char *args)
@@ -1840,6 +1893,7 @@ void yon_terminal_integrated_start(GtkWidget *terminal, char* command, void *end
             }
             FILE *fp;
             fp=fopen(__yon_window_config_path,"w");
+            chmod(__yon_window_config_path,0777);
             fclose(fp);
             g_key_file_load_from_file(__yon_window_config_file,__yon_window_config_path,G_KEY_FILE_NONE,NULL);
         }

source/ubl-utils.h

@@ -191,6 +191,10 @@ apps *yon_apps_get_by_name(apps *applist, char *name, int size);
 
 config_str yon_file_open(char *file_path, int *size);
 
+int yon_file_create(char *path, char *name, int rules);
+
+int yon_file_create_full_path(char *path, int rules);
+
 config_str yon_dir_get_contents(char *dir_path, int *size);
 
 //config functions

ubl-settings-logging-terminal.glade

@@ -3,16 +3,30 @@
 <interface domain="ubl-settings-logging">
   <requires lib="gtk+" version="3.24"/>
   <requires lib="vte-2.91" version="0.68"/>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+  </object>
   <object class="GtkBox" id="TerminalBox">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="VteTerminal" id="LoggingTerminal">
             <property name="visible">True</property>
             <property name="can-focus">True</property>
             <property name="hscroll-policy">natural</property>
+            <property name="vadjustment">adjustment3</property>
             <property name="vscroll-policy">natural</property>
+            <property name="cursor-blink-mode">off</property>
+            <property name="cursor-shape">underline</property>
             <property name="encoding">UTF-8</property>
+            <property name="pointer-autohide">True</property>
             <property name="scrollback-lines">0</property>
             <property name="scroll-on-keystroke">True</property>
             <property name="scroll-on-output">False</property>
@@ -23,11 +37,35 @@
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkLabel" id="UnfoundLabel">
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">Label</property>
+            <property name="xalign">0.019999999552965164</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+              <attribute name="foreground" value="#e0e01b1b2424"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
     <child>
       <object class="GtkScrollbar">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
+        <property name="adjustment">adjustment3</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -36,9 +74,4 @@
       </packing>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">100</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-  </object>
 </interface>

ubl-settings-logging.pot

@@ -755,6 +755,10 @@ msgstr ""
 msgid "Value:"
 msgstr ""
 
+#: source/ubl-strings.h:202
+msgid ": no such file(s)"
+msgstr ""
+
 msgid "System event log rotation service"
 msgstr ""
 

ubl-settings-logging_ru.po

@@ -769,6 +769,10 @@ msgstr "Исполнение"
 msgid "Value:"
 msgstr "Значение:"
 
+#: source/ubl-strings.h:202
+msgid ": no such file(s)"
+msgstr ": файл(ы) не найден(ы)"
+
 msgid "System event log rotation service"
 msgstr "Служба ротации системных журналов событий"