Merge branch 'master' of https://github.com/perseo22/pacmanager

perseo22 · Oct 9, 2016 · 024bcb2 · 024bcb2
2 parents 7948898 + 1a0803d
commit 024bcb2
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 14 deletions.
diff --git a/README b/README
@@ -56,7 +56,7 @@
 
 	- 4.5.5.8:
 
-		. 
+		. Fixed a bug that prevented PAC from starting with "clusters" view selected
 
 	- 4.5.5.7:
 

diff --git a/lib/PACMain.pm b/lib/PACMain.pm
@@ -894,8 +894,12 @@ sub _initGUI {
 		$self -> _updateFavouritesList;
 		$self -> _updateGUIFavourites;
 	}
-	else {
+	elsif ( $$self{_CFG}{'defaults'}{'start PAC tree on'} eq 'history' ) {
 		$$self{_GUI}{nbTree} -> set_current_page( 2 );
+		$self -> _updateGUIClusters;
+	}
+	else {
+		$$self{_GUI}{nbTree} -> set_current_page( 3 );
 		$self -> _updateGUIHistory;
 	}
 

diff --git a/lib/PACTerminal.pm b/lib/PACTerminal.pm
@@ -1055,7 +1055,7 @@ sub _watchConnectionData {
 			$data = $self -> _checkSendKeystrokes( $data );
 
 			defined $$self{_EMBED_KIDNAP} and eval { Glib::Source -> remove( $$self{_EMBED_KIDNAP} ); };
-			$$self{_EMBED_KIDNAP} = Glib::Timeout -> add( 100, sub {
+			$$self{_EMBED_KIDNAP} = Glib::Timeout -> add( 500, sub {
 				my $title = 'FreeRDP: ' . $$self{_CFG}{environments}{$$self{_UUID}}{ip} . ( $$self{_CFG}{environments}{$$self{_UUID}}{port} == 3389 ? '' : ":$$self{_CFG}{environments}{$$self{_UUID}}{port}" );
 				$title = $$self{_CFG}{environments}{$$self{_UUID}}{method} eq 'RDP (xfreerdp)' ?
 					"FreeRDP: $$self{_CFG}{environments}{$$self{_UUID}}{ip}" . ( $$self{_CFG}{environments}{$$self{_UUID}}{port} == 3389 ? '' : ":$$self{_CFG}{environments}{$$self{_UUID}}{port}" ) :

diff --git a/lib/PACUtils.pm b/lib/PACUtils.pm
@@ -126,6 +126,15 @@ my %WINDOWPROGRESS;
 my $WIDGET_POPUP;
 
 our @DONATORS_LIST	= (
+	'Jeff Bakst',
+	'Sebastian Treu',
+	"Brian's Consultant Services",
+	'Cheah CH',
+	'Joseph Whipple',
+	'Felix Brack',
+	'Kalmykov Alexander',
+	'Paul Verreth',
+	'Iftimie Catalin Panaite',
 	'Andre Geißler',
 	'Arend de Boer',
 	'Taylor Finklea',
@@ -1843,7 +1852,7 @@ sub _cfgSanityCheck {
 	$$cfg{'defaults'}{'screenshots external viewer'}	//= '/usr/bin/xdg-open';
 	$$cfg{'defaults'}{'screenshots use external viewer'}//= 0;
 	$$cfg{'defaults'}{'sort groups first'}				//= 1;
-	$$cfg{'defaults'}{'word characters'}				//= '\.:_\/-A-Za-z0-9';
+	$$cfg{'defaults'}{'word characters'}				//= '\.:_\/a-zA-Z0-9-';
 	$$cfg{'defaults'}{'terminal emulation'}				//= 'xterm';
 	$$cfg{'defaults'}{'show tray icon'}					//= 1;
 	$$cfg{'defaults'}{'unsplit disconnected terminals'}	//= 0;
@@ -3034,7 +3043,7 @@ sub _getXWindowsList {
 			$list{'by_pid'}{$data_pid}{'xid'}		= $xid;
 			$list{'by_pid'}{$data_pid}{'command'}	= $data_command;
 		}
-	}   
+	}
 
 	#my $tw = Gtk2::Window -> new;
 	#my $vb = Gtk2::VBox -> new( 0, 0 );
@@ -3048,7 +3057,7 @@ sub _getXWindowsList {
 	#my $sock = Gtk2::Socket -> new;
 	#$vb -> add( $sock );
 	#$tw -> show_all;
-	#$sock -> add_id( $$list{'by_name'}{'Calculator'}{'xid'} );
+	#$sock -> add_id( $list{'by_name'}{'Calculator'}{'xid'} );
 
 	return \%list;
 }

diff --git a/lib/pac_conn b/lib/pac_conn
@@ -665,13 +665,6 @@ sub _execScript {
 		$EXP -> clear_accum;
 		send_slow( $EXP, $txt );
 	};
-	$TERMINAL{get_prompt}	= sub {
-		my $del_esq = shift // 1;
-		ctrl( "SCRIPT_SUB_GET_PROMPT[NAME:$name][PID:$$][PARAMS:]" );
-		my $prompt = _getPrompt();
-		$del_esq and $prompt = _removeEscapeSeqs( $prompt );
-		return "\Q$prompt\E";
-	};
 	$TERMINAL{send_get}	= sub {
 		my $txt		= shift // '';
 		my $intro	= shift // 1;
@@ -683,6 +676,13 @@ sub _execScript {
 		$out =~ s/^.+?\R//go;
 		return _removeEscapeSeqs( $out );
 	};
+	$TERMINAL{get_prompt}	= sub {
+		my $del_esq = shift // 1;
+		ctrl( "SCRIPT_SUB_GET_PROMPT[NAME:$name][PID:$$][PARAMS:]" );
+		my $prompt = _getPrompt();
+		$del_esq and $prompt = _removeEscapeSeqs( $prompt );
+		return "\Q$prompt\E";
+	};
 	$TERMINAL{expect}	= sub {
 		my $pattern	= shift // '';
 		my $tmout	= shift // 1;

diff --git a/pac b/pac
@@ -113,6 +113,7 @@ if ( ! ( $PAC = PACMain -> new( @ARGV ) ) ) {
 	print STDERR "PAC not starting. PAC already running?\n";
 	exit 0
 }
+use Data::Dumper; print Dumper( PACUtils::_getXWindowsList );
 $PAC -> start;
 
 print "Finished $Script (PID:$$)...\n";

diff --git a/res/pac.desktop b/res/pac.desktop
@@ -10,7 +10,7 @@ Name[en_US]=PAC
 Comment[en_US]=Perl Auto Connector
 Categories=Applications;Network;
 X-GNOME-Autostart-enabled=false
-Actions=Shell;Quick;
+Actions=Shell;Quick;ReadOnly;
 
 [Desktop Action Shell]
 Name=Start local shell
@@ -22,3 +22,8 @@ Name=Quick connect...
 Exec=pac --quick-conn
 #OnlyShowIn=Unity;
 
+[Desktop Action ReadOnly]
+Name=Start Read-Only instance
+Exec=pac --readonly --no-backup
+#OnlyShowIn=Unity;
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ @@
     	- 4.5.5.8:
-    		.
+    		. Fixed a bug that prevented PAC from starting with "clusters" view selected
     	- 4.5.5.7:
@@ Expand Down @@