From eb5380ababc9c92698cd68c4594d12536e4d1358 Mon Sep 17 00:00:00 2001 From: huakim <92579808+huakim@users.noreply.github.com> Date: Wed, 12 Mar 2025 19:12:01 +0300 Subject: [PATCH 1/6] Update Constant.pm --- lib/Padre/Wx/Constant.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/Padre/Wx/Constant.pm b/lib/Padre/Wx/Constant.pm index 99e55a2e7..8c5b1a50b 100644 --- a/lib/Padre/Wx/Constant.pm +++ b/lib/Padre/Wx/Constant.pm @@ -270,7 +270,6 @@ use constant WANT => qw{ :listctrl :locale :menu - :miniframe :misc :notebook :ownerdrawncombobox From e7e89986cdc40998d01d582e86ba6cc5d4e8895f Mon Sep 17 00:00:00 2001 From: u Date: Wed, 12 Mar 2025 19:59:05 +0300 Subject: [PATCH 2/6] update --- lib/Padre/Wx/Main.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Padre/Wx/Main.pm b/lib/Padre/Wx/Main.pm index bec984e2f..557d434dd 100644 --- a/lib/Padre/Wx/Main.pm +++ b/lib/Padre/Wx/Main.pm @@ -60,6 +60,8 @@ use Padre::Wx::Role::Timer (); use Padre::Wx::Role::Idle (); use Padre::Locale::T; use Padre::Logger; +use File::Which 'which'; + our $VERSION = '1.02'; our $COMPATIBLE = '0.91'; our @ISA = qw{ @@ -2955,11 +2957,11 @@ sub run_command { } elsif (Padre::Constant::UNIX) { if ( defined $ENV{COLORTERM} ) { - if ( $ENV{COLORTERM} eq 'gnome-terminal' ) { + if ( ($ENV{COLORTERM} eq 'gnome-terminal') || (!which('xterm')) ) { #Gnome-Terminal line format: #gnome-terminal -e "bash -c \"prove -lv t/96_edit_patch.t; exec bash\"" - system qq($ENV{COLORTERM} -e "bash -c \\\"$cmd; exec bash\\\"" & ); + system qq(gnome-terminal -e "bash -c \\\"$cmd; exec bash\\\"" & ); } else { system qq(xterm -sb -e "$cmd; sleep 1000" &); } From 430e05bcd4a18636ef963a07689df63556bf276d Mon Sep 17 00:00:00 2001 From: huakim <92579808+huakim@users.noreply.github.com> Date: Wed, 12 Mar 2025 20:55:02 +0300 Subject: [PATCH 3/6] Update Main.pm --- lib/Padre/Wx/Main.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Padre/Wx/Main.pm b/lib/Padre/Wx/Main.pm index 557d434dd..019c3465a 100644 --- a/lib/Padre/Wx/Main.pm +++ b/lib/Padre/Wx/Main.pm @@ -2957,7 +2957,7 @@ sub run_command { } elsif (Padre::Constant::UNIX) { if ( defined $ENV{COLORTERM} ) { - if ( ($ENV{COLORTERM} eq 'gnome-terminal') || (!which('xterm')) ) { + if ( ($ENV{COLORTERM} eq 'gnome-terminal') || (which('gnome-terminal')) ) { #Gnome-Terminal line format: #gnome-terminal -e "bash -c \"prove -lv t/96_edit_patch.t; exec bash\"" From 7ac86ccd04628dc313f3cbd8b10913eec8f475ca Mon Sep 17 00:00:00 2001 From: huakim <92579808+huakim@users.noreply.github.com> Date: Wed, 12 Mar 2025 21:01:45 +0300 Subject: [PATCH 4/6] Update Main.pm --- lib/Padre/Wx/Main.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Padre/Wx/Main.pm b/lib/Padre/Wx/Main.pm index 019c3465a..fecfe681f 100644 --- a/lib/Padre/Wx/Main.pm +++ b/lib/Padre/Wx/Main.pm @@ -2957,11 +2957,14 @@ sub run_command { } elsif (Padre::Constant::UNIX) { if ( defined $ENV{COLORTERM} ) { - if ( ($ENV{COLORTERM} eq 'gnome-terminal') || (which('gnome-terminal')) ) { - + my @terminals = (); + push @terminals, which('gnome-terminal'); + push @terminals, which('x-terminal-emulator'); + push @terminals, which('konsole'); + if ( @terminals ) { #Gnome-Terminal line format: #gnome-terminal -e "bash -c \"prove -lv t/96_edit_patch.t; exec bash\"" - system qq(gnome-terminal -e "bash -c \\\"$cmd; exec bash\\\"" & ); + system $terminals[0], qq(-e "bash -c \\\"$cmd; exec bash\\\"" & ); } else { system qq(xterm -sb -e "$cmd; sleep 1000" &); } From cdd00d9775c1b2ac2a9c7b740eb2263fddf0d5e0 Mon Sep 17 00:00:00 2001 From: u Date: Thu, 13 Mar 2025 00:32:57 +0300 Subject: [PATCH 5/6] update --- lib/Padre/Wx/Main.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Padre/Wx/Main.pm b/lib/Padre/Wx/Main.pm index fecfe681f..e566e9b86 100644 --- a/lib/Padre/Wx/Main.pm +++ b/lib/Padre/Wx/Main.pm @@ -2964,7 +2964,7 @@ sub run_command { if ( @terminals ) { #Gnome-Terminal line format: #gnome-terminal -e "bash -c \"prove -lv t/96_edit_patch.t; exec bash\"" - system $terminals[0], qq(-e "bash -c \\\"$cmd; exec bash\\\"" & ); + system $terminals[0] . " " . qq(-e "bash -c \\\"$cmd; exec bash\\\"" & ); } else { system qq(xterm -sb -e "$cmd; sleep 1000" &); } From b5597171777cd4590f282aec37bc218d8986c6a4 Mon Sep 17 00:00:00 2001 From: huakim <92579808+huakim@users.noreply.github.com> Date: Thu, 13 Mar 2025 00:57:28 +0300 Subject: [PATCH 6/6] Update Main.pm --- lib/Padre/Wx/Main.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Padre/Wx/Main.pm b/lib/Padre/Wx/Main.pm index e566e9b86..7900d8614 100644 --- a/lib/Padre/Wx/Main.pm +++ b/lib/Padre/Wx/Main.pm @@ -2958,15 +2958,15 @@ sub run_command { if ( defined $ENV{COLORTERM} ) { my @terminals = (); - push @terminals, which('gnome-terminal'); - push @terminals, which('x-terminal-emulator'); - push @terminals, which('konsole'); + push @terminals, which('gnome-terminal'); + push @terminals, which('x-terminal-emulator'); + push @terminals, which('konsole'); + push @terminals, which('xterm'); if ( @terminals ) { #Gnome-Terminal line format: #gnome-terminal -e "bash -c \"prove -lv t/96_edit_patch.t; exec bash\"" - system $terminals[0] . " " . qq(-e "bash -c \\\"$cmd; exec bash\\\"" & ); - } else { - system qq(xterm -sb -e "$cmd; sleep 1000" &); + my $term = $terminals[0]; + system qq($term -e "bash -c \\\"$cmd; echo; echo Press any key to exit....; read -n 1; exit 0;\\\"" & ); } } } elsif (Padre::Constant::MAC) {