From 5797b97fca62ab5dd67ef2242cdc99cec49b5360 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 16 Jul 2024 16:58:25 +0600 Subject: [PATCH] fixed window transistance, removed log label statrup text, changed log window title --- source/ubinstall-gtk.c | 14 ++++++++------ source/ubl-strings.h | 2 ++ ubinstall-gtk-log-view.glade | 3 +-- ubinstall-gtk.pot | 4 ++++ ubinstall-gtk_ru.po | 4 ++++ 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 9d056e3..51f324d 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -555,16 +555,18 @@ if (window->Window){ return 0; } -void on_process_log_view(); -void on_process_log_view(){ +void on_process_log_view(GtkWidget *,main_window *widgets); +void on_process_log_view(GtkWidget *,main_window *widgets){ log_window *window = yon_log_window_new(); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),LOG_VIEW_LABEL,icon_path,"log_viewer"); window->command = yon_char_new(short_log_path); gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window); } -void on_summary_log_view(); -void on_summary_log_view(){ +void on_summary_log_view(GtkWidget *,main_window *widgets); +void on_summary_log_view(GtkWidget *,main_window *widgets){ log_window *window = yon_log_window_new(); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),LOG_VIEW_LABEL,icon_path,"log_viewer"); window->command = yon_char_new(full_log_path); gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window); @@ -1391,8 +1393,8 @@ main_window *yon_main_window_complete(){ widgets->AdditionalSoftwareList = GTK_LIST_STORE(gtk_builder_get_object(builder,"AdditionalSoftwareList")); widgets->PartitionsList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PartitionsList")); - g_signal_connect(G_OBJECT(widgets->ReadFullLogButton),"clicked",G_CALLBACK(on_summary_log_view),NULL); - g_signal_connect(G_OBJECT(widgets->ReadShortLogButton),"clicked",G_CALLBACK(on_process_log_view),NULL); + g_signal_connect(G_OBJECT(widgets->ReadFullLogButton),"clicked",G_CALLBACK(on_summary_log_view),widgets); + g_signal_connect(G_OBJECT(widgets->ReadShortLogButton),"clicked",G_CALLBACK(on_process_log_view),widgets); g_signal_connect(G_OBJECT(widgets->GpartedCommonButton),"clicked",G_CALLBACK(on_gparted_open),NULL); g_signal_connect(G_OBJECT(widgets->GpartedSameButton),"clicked",G_CALLBACK(on_gparted_open),NULL); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 1f272cd..acf0d95 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -136,3 +136,5 @@ #define CONFIGURATION_MODE_LABEL _("Configuration mode") #define ERROR_HEAD_LABEL _("Error") #define ERROR_LABEL _("Error has occured while installation process") + +#define LOG_VIEW_LABEL _("Log exploration") \ No newline at end of file diff --git a/ubinstall-gtk-log-view.glade b/ubinstall-gtk-log-view.glade index a09a1e4..3ae0a8e 100644 --- a/ubinstall-gtk-log-view.glade +++ b/ubinstall-gtk-log-view.glade @@ -55,7 +55,6 @@ True False - label 0 0 @@ -87,7 +86,7 @@ True False - Keyboard layout language + Log exploration diff --git a/ubinstall-gtk.pot b/ubinstall-gtk.pot index ef919bb..23a2639 100644 --- a/ubinstall-gtk.pot +++ b/ubinstall-gtk.pot @@ -486,6 +486,10 @@ msgstr "" msgid "Configuration mode" msgstr "" +#: source/ubl-strings.h:140 +msgid "Log exploration" +msgstr "" + msgid "Afrikaans" msgstr "" diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index d3fbdff..168de28 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -508,6 +508,10 @@ msgstr "Во время процесса установки произошла msgid "Configuration mode" msgstr "Режим конфигурации" +#: source/ubl-strings.h:140 +msgid "Log exploration" +msgstr "Просмотр лога" + msgid "Afrikaans" msgstr "Африканский"