Fix bug #51708 on bugs.kde.org (kstars exiting when view is swithed to a point below the horizon). This is a patch from upstream cvs.

4 files changed, 136 insertions, 1 deletions

diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index f80c83d7d58e..04669ee70013 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.21 2003/02/01 20:30:58 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.22 2003/02/02 21:21:14 danarmak Exp $
+
+*kdeedu-3.1-r1 (02 Feb 2003)
+
+  02 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #51708 on bugs.kde.org (kstars exiting when view is swithed to a
+  point below the horizon). This is a patch from upstream cvs.
 
   01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdeedu-3.1.ebuild:
   added ~sparc to keywords
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.1-r1 b/kde-base/kdeedu/files/digest-kdeedu-3.1-r1
new file mode 100644
index 000000000000..4028f7b0862b
--- /dev/null
+++ b/kde-base/kdeedu/files/digest-kdeedu-3.1-r1
@@ -0,0 +1 @@
+MD5 ed587675e6b4a18a416c05e0a106e8a7 kdeedu-3.1.tar.bz2 19974202
diff --git a/kde-base/kdeedu/files/kdeedu-3.1-branch-20030202.diff b/kde-base/kdeedu/files/kdeedu-3.1-branch-20030202.diff
new file mode 100644
index 000000000000..3622756d2dfc
--- /dev/null
+++ b/kde-base/kdeedu/files/kdeedu-3.1-branch-20030202.diff
@@ -0,0 +1,115 @@
+? branch.diff
+Index: kstars/kstars.cpp
+===================================================================
+RCS file: /home/kde/kdeedu/kstars/kstars/kstars.cpp,v
+retrieving revision 1.53
+retrieving revision 1.53.2.1
+diff -u -p -r1.53 -r1.53.2.1
+--- kstars/kstars/kstars.cpp	14 Oct 2002 22:29:24 -0000	1.53
++++ kstars/kstars/kstars.cpp	2 Feb 2003 04:04:53 -0000	1.53.2.1
+@@ -91,7 +91,6 @@ KStars::KStars( KStarsData* kd )
+ 
+ KStars::~KStars()
+ {
+-	kdDebug() << "in kstars destructor..." << endl;
+ 	saveOptions();
+ 
+ 	clearCachedFindDialog();
+Index: kstars/kstarsinit.cpp
+===================================================================
+RCS file: /home/kde/kdeedu/kstars/kstars/kstarsinit.cpp,v
+retrieving revision 1.26
+retrieving revision 1.26.2.2
+diff -u -p -r1.26 -r1.26.2.2
+--- kstars/kstars/kstarsinit.cpp	12 Oct 2002 14:17:31 -0000	1.26
++++ kstars/kstars/kstarsinit.cpp	2 Feb 2003 06:41:25 -0000	1.26.2.2
+@@ -304,7 +304,7 @@ void KStars::initActions() {
+ void KStars::initStatusBar() {
+ 	statusBar()->insertItem( i18n( " Welcome to KStars " ), 0, 1, true );
+ 	statusBar()->setItemAlignment( 0, AlignLeft | AlignVCenter );
+-	QString s = "00:00:00,   +00:00:00";
++	QString s = "00h 00m 00s,   +00d 00\'00\"";
+ 
+ 	statusBar()->insertItem( s, 1, 1, true );
+ 	statusBar()->setItemAlignment( 1, AlignRight | AlignVCenter );
+@@ -366,10 +366,33 @@ void KStars::datainitFinished(bool worke
+ 
+ 	pd->buildGUI();
+ 	updateTime();
+-
+ 	clock->start();
+ 	show();
+ 
++//Check whether initial position is below the horizon.
++//We sued to just call slotCenter() in buildGUI() which performs this check.  
++//However, on a Gentoo system, if the messagebox is shown before show() is called, 
++//the program exits.  It does not crash (at least there are no error messages),
++//it simply exits.  Very strange.
++	if ( options()->useAltAz && options()->drawGround &&
++			map()->focus()->alt().Degrees() < -1.0 ) {
++		QString caption = i18n( "Initial Position is Below Horizon" );
++		QString message = i18n( "The initial position is below the horizon.\nWould you like to reset to the default position?" );
++		if ( KMessageBox::warningYesNo( this, message, caption, 
++				KStdGuiItem::yes(), KStdGuiItem::no(), "dag_start_below_horiz" ) == KMessageBox::Yes ) {
++			map()->setClickedObject( NULL );
++			map()->setFoundObject( NULL );
++			options()->isTracking = false;
++			options()->setSnapNextFocus(true);
++			
++			SkyPoint DefaultFocus;
++			DefaultFocus.setAz( 180.0 );
++			DefaultFocus.setAlt( 45.0 );
++			DefaultFocus.HorizontalToEquatorial( LSTh(), geo()->lat() );
++			map()->setDestination( &DefaultFocus );
++		}
++	}
++
+ // just show dialog if option is set (don't force it)	
+ 	KTipDialog::showTip( "kstars/tips" );
+ }
+@@ -493,21 +516,22 @@ void KStars::privatedata::buildGUI() {
+ 			}
+ 		}
+ 
+-		ks->map()->slotCenter();
++//		ks->map()->slotCenter();
+ 	} else {
+ 		ks->map()->setClickedPoint( &newPoint );
+-		ks->map()->slotCenter();
++//		ks->map()->slotCenter();
+ 	}
+ 
++	ks->map()->setDestination( ks->map()->clickedPoint() );
++	ks->map()->destination()->EquatorialToHorizontal( ks->LSTh(), ks->geo()->lat() );
+ 	ks->map()->setFocus( ks->map()->destination() );
+ 	ks->map()->focus()->EquatorialToHorizontal( ks->LSTh(), ks->geo()->lat() );
+-	ks->map()->destination()->EquatorialToHorizontal( ks->LSTh(), ks->geo()->lat() );
+ 
+ 	ks->setHourAngle();
+ 
+ 	ks->map()->setOldFocus( ks->map()->focus() );
+-	ks->map()->oldfocus()->setAz( ks->map()->focus()->az() );
+-	ks->map()->oldfocus()->setAlt( ks->map()->focus()->alt() );
++	ks->map()->oldfocus()->setAz( ks->map()->focus()->az().Degrees() );
++	ks->map()->oldfocus()->setAlt( ks->map()->focus()->alt().Degrees() );
+ 
+ 	kapp->dcopClient()->resume();
+ 
+Index: kstars/skymap.cpp
+===================================================================
+RCS file: /home/kde/kdeedu/kstars/kstars/skymap.cpp,v
+retrieving revision 1.71
+retrieving revision 1.71.2.1
+diff -u -p -r1.71 -r1.71.2.1
+--- kstars/kstars/skymap.cpp	12 Oct 2002 14:17:31 -0000	1.71
++++ kstars/kstars/skymap.cpp	2 Feb 2003 04:04:53 -0000	1.71.2.1
+@@ -295,7 +295,8 @@ void SkyMap::slotCenter( void ) {
+ 		QString caption = i18n( "Requested Position Below Horizon" );
+ 		QString message = i18n( "The requested position is below the horizon.\nWould you like to go there anyway?" );
+ 
+-		if ( KMessageBox::warningYesNo( 0, message, caption )==KMessageBox::No ) {
++		if ( KMessageBox::warningYesNo( ksw, message, caption,
++				KStdGuiItem::yes(), KStdGuiItem::no(), "dag_focus_below_horiz" )==KMessageBox::No ) {
+ 			setClickedObject( NULL );
+ 			setFoundObject( NULL );
+ 			ksw->options()->isTracking = false;
diff --git a/kde-base/kdeedu/kdeedu-3.1-r1.ebuild b/kde-base/kdeedu/kdeedu-3.1-r1.ebuild
new file mode 100644
index 000000000000..a52ee715fda7
--- /dev/null
+++ b/kde-base/kdeedu/kdeedu-3.1-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.1-r1.ebuild,v 1.1 2003/02/02 21:21:14 danarmak Exp $
+inherit kde-dist 
+
+DESCRIPTION="KDE educational apps"
+
+KEYWORDS="~x86 ~ppc ~sparc"
+
+# patch to fix bug #51708 on bugs.kde.org, from kstars developer
+# together with smaller fixes from the 3_1_BRANCH of kstars at this date
+PATCHES="${FILESDIR}/${P}-branch-20030202.diff"