From b424a1ce5b55e10ef7d784508d548c925c4b5a86 Mon Sep 17 00:00:00 2001
From: Chitlesh GOORAH <chitlesh@fedoraproject.org>
Date: Sep 12 2007 09:11:02 +0000
Subject: *** empty log message ***


---

diff --git a/ktechlab-bugfix.diff b/ktechlab-bugfix.diff
new file mode 100644
index 0000000..0efa923
--- /dev/null
+++ b/ktechlab-bugfix.diff
@@ -0,0 +1,52 @@
+Index: src/picitem.h
+===================================================================
+--- src/picitem.h	(Revision 18)
++++ src/picitem.h	(Arbeitskopie)
+@@ -76,6 +76,8 @@
+ 	
+ 		static QString typeString() { return "microitem"; }
+ 		virtual void updateZ( int baseZ );
++
++		bool mousePressEvent( const EventInfo &info );
+ 	
+ 	protected slots:
+ 		void slotMicroSettingsDlgAccepted();
+Index: src/picitem.cpp
+===================================================================
+--- src/picitem.cpp	(Revision 18)
++++ src/picitem.cpp	(Arbeitskopie)
+@@ -15,6 +15,7 @@
+ #include "microsettingsdlg.h"
+ #include "micropackage.h"
+ #include "picitem.h"
++#include "eventinfo.h"
+ 
+ #include <kdebug.h>
+ #include <kiconloader.h>
+@@ -386,6 +387,26 @@
+ 	
+ 	p_icnDocument->requestStateSave();
+ }
++
++bool PicItem::mousePressEvent( const EventInfo &info )
++{
++	QMouseEvent *e = info.mouseReleaseEvent( 0, 0 );
++
++	const PinItemList::iterator end = m_pinItemList.end();
++	for ( PinItemList::iterator it = m_pinItemList.begin(); it != end; ++it )
++		if ( (*it)->boundingRect().contains(info.pos) ) 
++		{
++			if (e->isAccepted())
++			{
++				(*it)->switchState();
++				delete e;
++				return true;
++			}
++		}
++	delete e;
++
++	return CNItem::mousePressEvent( info );
++}
+ //END class PicItem
+ 
+ #include "picitem.moc"
diff --git a/ktechlab.spec b/ktechlab.spec
index 18f8c9b..e41088a 100644
--- a/ktechlab.spec
+++ b/ktechlab.spec
@@ -1,7 +1,8 @@
 Name:             ktechlab
 Version:          0.3.69
-Release:          4.20070626svn%{?dist}
-# revision checkout 18
+Release:          5%{?dist}
+# revision checkout 18 with chitlesh's enhancements that upstream
+# haven't added since 2 months
 Summary:          Development and simulation of microcontrollers and electronic circuits
 
 License:          GPLv2
@@ -11,6 +12,7 @@ URL:              http://sourceforge.net/projects/ktechlab/
 Source:           http://downloads.sourceforge.net/ktechlab/%{name}-%{version}.tar.bz2
 
 Patch0:           ktechlab-0.3.6-multilib.patch
+Patch1:           ktechlab-bugfix.diff
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,6 +44,7 @@ to KTechlab.
 %{__rm} -rf autom4te.cache
 
 %patch0 -p0 -b .multilib
+%patch1 -p0 -b .bugfix
 
 %build
 %configure --disable-rpath
@@ -52,12 +55,13 @@ to KTechlab.
 %{__make} DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor fedora            \
-    --add-category Engineering                  \
+    --remove-category Education                 \
     --delete-original                           \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{buildroot}%{_datadir}/applnk/Development/%{name}.desktop
 
-#setting default path for sdcc
+
+#fedora-specific : setting default path for sdcc
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/profile.d
 cat > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh << EOF
 # setting default path for sdcc - fedora
@@ -68,7 +72,10 @@ chmod 0755 %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
 # Fix absolute symlink
 %{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
 
-# No translation
+#fixing missing icon
+%{__cp} -p icons/pics/bar_graph_display.png %{buildroot}%{_datadir}/apps/%{name}/icons/
+
+
 %find_lang %{name}
 
 %clean
@@ -76,6 +83,7 @@ chmod 0755 %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
+source %{_sysconfdir}/profile.d/%{name}.sh
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_bindir}/update-desktop-database %{_datadir}/applications || :
 
@@ -100,7 +108,12 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %Changelog
-* Sat Aug 18 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.6-6
+* Sat Sep 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-5
+- updated desktop file
+- fixed missing icon of bar graph display
+- disable rough oscilloscope
+
+* Sat Aug 18 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-4.20070626svn
 - fixed conflict with alliance and changed license
 
 * Mon Aug 13 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-3.20070626svn
diff --git a/sources b/sources
index aacd036..9fa09ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92bc145289d18bd89118754d66e7a6a2  ktechlab-0.3.69.tar.bz2
+9404e62c621df5d34b2bc455a8d0ae42  ktechlab-0.3.69.tar.bz2