rpms/ktechlab/devel ktechlab-bugfix.diff, NONE, 1.1 ktechlab.spec, 1.13, 1.14 sources, 1.4, 1.5

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5664/devel

Modified Files:
	ktechlab.spec sources 
Added Files:
	ktechlab-bugfix.diff 
Log Message:


ktechlab-bugfix.diff:

--- NEW FILE ktechlab-bugfix.diff ---
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"


Index: ktechlab.spec
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ktechlab.spec	18 Aug 2007 20:34:42 -0000	1.13
+++ ktechlab.spec	12 Sep 2007 09:11:02 -0000	1.14
@@ -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 @@
 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 @@
 %{__rm} -rf autom4te.cache
 
 %patch0 -p0 -b .multilib
+%patch1 -p0 -b .bugfix
 
 %build
 %configure --disable-rpath
@@ -52,12 +55,13 @@
 %{__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 @@
 # 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 @@
 
 %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 @@
 
 
 %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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ktechlab/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jun 2007 12:14:30 -0000	1.4
+++ sources	12 Sep 2007 09:11:02 -0000	1.5
@@ -1 +1 @@
-92bc145289d18bd89118754d66e7a6a2  ktechlab-0.3.69.tar.bz2
+9404e62c621df5d34b2bc455a8d0ae42  ktechlab-0.3.69.tar.bz2