From 1be26cf0ae89fd50495d6febc64a182367cb9054 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 17 Jul 2024 14:29:35 +0600 Subject: [PATCH] Removed modality from log view window --- source/ubinstall-gtk.c | 8 +++++--- ubinstall-gtk-log-view.glade | 1 - ubinstall-gtk.glade | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index a76a3ed..f204241 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -558,7 +558,7 @@ return 0; 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"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,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); } @@ -566,7 +566,7 @@ void on_process_log_view(GtkWidget *,main_window *widgets){ 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"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,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); @@ -1337,6 +1337,7 @@ main_window *yon_main_window_complete(){ widgets->ReadShortLogButton = yon_gtk_builder_get_widget(builder,"ReadShortLogButton"); widgets->PackageInstallationProgress = yon_gtk_builder_get_widget(builder,"PackageInstallationProgress"); widgets->PackageInstallationLabel = yon_gtk_builder_get_widget(builder,"PackageInstallationLabel"); + widgets->ReadFullLogButton = yon_gtk_builder_get_widget(builder,"ReadFullLogButton"); widgets->SameInstallationFilesystemTypeCombo = yon_gtk_builder_get_widget(builder,"SameInstallationFilesystemTypeCombo"); widgets->SameInstallationFormatCheck = yon_gtk_builder_get_widget(builder,"SameInstallationFormatCheck"); @@ -1392,7 +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->ReadShortLogButton),"clicked",G_CALLBACK(on_summary_log_view),widgets); + 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/ubinstall-gtk-log-view.glade b/ubinstall-gtk-log-view.glade index 3ae0a8e..88255a9 100644 --- a/ubinstall-gtk-log-view.glade +++ b/ubinstall-gtk-log-view.glade @@ -7,7 +7,6 @@ 200 400 False - True 800 com.ublinux.ubinstall-gtk diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 596066f..6aa435c 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -107,6 +107,11 @@ False com.ublinux.libublsettingsui-gtk3.trash-symbolic + + True + False + com.ublinux.ubinstall.properties-symbolic + True False @@ -6911,6 +6916,23 @@ separately into the selected partition. 0 + + + True + True + True + image15 + + + + False + True + end + 1 + + False