From owner-svn-ports-head@FreeBSD.ORG Tue Oct 7 12:54:46 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB013594; Tue, 7 Oct 2014 12:54:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D588BB25; Tue, 7 Oct 2014 12:54:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97CskhU071817; Tue, 7 Oct 2014 12:54:46 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97CskSR071816; Tue, 7 Oct 2014 12:54:46 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <201410071254.s97CskSR071816@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Tue, 7 Oct 2014 12:54:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370330 - head/devel/tkcon/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Oct 2014 12:54:47 -0000 Author: gahr Date: Tue Oct 7 12:54:46 2014 New Revision: 370330 URL: https://svnweb.freebsd.org/changeset/ports/370330 QAT: https://qat.redports.org/buildarchive/r370330/ Log: - Always ask confirmation before closing the console - Upstream: http://sourceforge.net/p/tkcon/feature-requests/8/ Modified: head/devel/tkcon/files/patch-tkcon.tcl Modified: head/devel/tkcon/files/patch-tkcon.tcl ============================================================================== --- head/devel/tkcon/files/patch-tkcon.tcl Tue Oct 7 12:49:01 2014 (r370329) +++ head/devel/tkcon/files/patch-tkcon.tcl Tue Oct 7 12:54:46 2014 (r370330) @@ -1,5 +1,5 @@ --- tkcon.tcl.orig 2009-02-27 01:17:21.000000000 +0100 -+++ tkcon.tcl 2013-09-26 16:10:14.000000000 +0200 ++++ tkcon.tcl 2013-10-01 11:43:39.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/sh # \ @@ -28,7 +28,30 @@ if {![catch {package require ActiveTcl} ver]} { set cmd "" if {$tcl_platform(platform) == "windows"} { -@@ -5018,6 +5018,11 @@ +@@ -2497,13 +2497,19 @@ + proc ::tkcon::Destroy {{slave {}}} { + variable PRIV + ++ set confirmed 0 ++ if {[tk_messageBox -parent $PRIV(root) -title "Close window?" \ ++ -message "Close the current window?" -default no \ ++ -icon question -type yesno] == "yes"} { set confirmed 1} ++ ++ if {!$confirmed} { ++ return ++ } ++ + # Just close on the last one + if {[llength $PRIV(interps)] == 1} { exit } + if {"" == $slave} { + ## Main interpreter close request +- if {[tk_messageBox -parent $PRIV(root) -title "Quit tkcon?" \ +- -message "Close all windows and exit tkcon?" \ +- -icon question -type yesno] == "yes"} { exit } + return + } elseif {$slave == $::tkcon::OPT(exec)} { + set name [tk appname] +@@ -5018,6 +5024,11 @@ ## We really didn't want the newline insertion bind TkConsole {}