[NeoStats-Devel] xBeeHome [Commits] r27 - in /Trunk/ControlPad: Makefile.am Makefile.in panel.cpp panel.h splashitem.cpp splashitem.h

Author: Fish
Date: Tue Aug 18 20:26:00 2009
New Revision: 27

URL: http://svn.neostats.net/cgi-bin/viewvc.cgi?rev=27&root=xBeeHome&view=rev
Log:
more updates for linux support

Modified:
    Trunk/ControlPad/Makefile.am
    Trunk/ControlPad/Makefile.in
    Trunk/ControlPad/panel.cpp
    Trunk/ControlPad/panel.h
    Trunk/ControlPad/splashitem.cpp
    Trunk/ControlPad/splashitem.h

Modified: Trunk/ControlPad/Makefile.am
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/Trunk/ControlPad/Makefile.am?rev=27&root=xBeeHome&r1=26&r2=27&view=diff
==============================================================================
--- Trunk/ControlPad/Makefile.am (original)
+++ Trunk/ControlPad/Makefile.am Tue Aug 18 20:26:00 2009
@@ -8,7 +8,7 @@
 # You have one .h file, it's called myapp.h. Therefore, here I list
 # its mocced name, moc_myapp.cpp.
 nodist_ControlPad_SOURCES = moc_panel.cpp moc_roundrectitem.cpp moc_splashitem.cpp resources.cpp
-nodist_ControlPad_INCLUDES = ui_backside.h
+BUILT_SOURCES = ui_backside.h
 		        	
 # This is to ensure the myapp.h file is distributed in your myapp-0.1.tar.gz
 # I also have a resources.qrc I need to include. The png is used in myapp.
@@ -28,5 +28,5 @@
 		        					
 # This line ensures that generated moc_*.cpp and resources.cpp files are
 # deleted when we make clean.
-CLEANFILES = $(nodist_ControlPad_SOURCES) $(nodist_ControlPad_INCLUDES)
+CLEANFILES = $(nodist_ControlPad_SOURCES)
 		        					

Modified: Trunk/ControlPad/Makefile.in
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/Trunk/ControlPad/Makefile.in?rev=27&root=xBeeHome&r1=26&r2=27&view=diff
==============================================================================
--- Trunk/ControlPad/Makefile.in (original)
+++ Trunk/ControlPad/Makefile.in Tue Aug 18 20:26:00 2009
@@ -188,7 +188,7 @@
 # You have one .h file, it's called myapp.h. Therefore, here I list
 # its mocced name, moc_myapp.cpp.
 nodist_ControlPad_SOURCES = moc_panel.cpp moc_roundrectitem.cpp moc_splashitem.cpp resources.cpp
-nodist_ControlPad_INCLUDES = ui_backside.h
+BUILT_SOURCES = ui_backside.h
 
 # This is to ensure the myapp.h file is distributed in your myapp-0.1.tar.gz
 # I also have a resources.qrc I need to include. The png is used in myapp.
@@ -198,8 +198,8 @@
 
 # This line ensures that generated moc_*.cpp and resources.cpp files are
 # deleted when we make clean.
-CLEANFILES = $(nodist_ControlPad_SOURCES) $(nodist_ControlPad_INCLUDES)
-all: config.h
+CLEANFILES = $(nodist_ControlPad_SOURCES)
+all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
@@ -524,13 +524,15 @@
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS) config.h
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -556,6 +558,7 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -628,7 +631,7 @@
 
 uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: all install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \

Modified: Trunk/ControlPad/panel.cpp
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/Trunk/ControlPad/panel.cpp?rev=27&root=xBeeHome&r1=26&r2=27&view=diff
==============================================================================
--- Trunk/ControlPad/panel.cpp (original)
+++ Trunk/ControlPad/panel.cpp Tue Aug 18 20:26:00 2009
@@ -41,7 +41,6 @@
 
 #include "panel.h"
 #include "roundrectitem.h"
-#include "splashitem.h"
 #include "ui_backside.h"
 
 #ifndef QT_NO_OPENGL
@@ -83,6 +82,11 @@
 
     baseItem = new RoundRectItem(bounds, QColor(226, 255, 92, 64));
     scene->addItem(baseItem);
+
+    splash = new SplashItem;
+    splash->setZValue(5);
+    splash->setPos(-splash->rect().width() / 2, scene->sceneRect().top());
+    scene->addItem(splash);
 
     QWidget *embed = new QWidget;
     ui = new Ui_BackSide;
@@ -140,10 +144,6 @@
     connect(flipTimeLine, SIGNAL(valueChanged(qreal)),
             this, SLOT(updateFlipStep(qreal)));
 
-    splash = new SplashItem;
-    splash->setZValue(5);
-    splash->setPos(-splash->rect().width() / 2, scene->sceneRect().top());
-    scene->addItem(splash);
 
     splash->grabKeyboard();
     

Modified: Trunk/ControlPad/panel.h
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/Trunk/ControlPad/panel.h?rev=27&root=xBeeHome&r1=26&r2=27&view=diff
==============================================================================
--- Trunk/ControlPad/panel.h (original)
+++ Trunk/ControlPad/panel.h Tue Aug 18 20:26:00 2009
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/qgraphicsview.h>
+#include "splashitem.h"
 
 QT_BEGIN_NAMESPACE
 class QTimeLine;
@@ -72,7 +73,7 @@
     RoundRectItem *selectionItem;
     RoundRectItem *baseItem;
     RoundRectItem *backItem;
-    QGraphicsWidget *splash;
+    SplashItem *splash;
     QTimeLine *selectionTimeLine;
     QTimeLine *flipTimeLine;
     int selectedX, selectedY;

Modified: Trunk/ControlPad/splashitem.cpp
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/Trunk/ControlPad/splashitem.cpp?rev=27&root=xBeeHome&r1=26&r2=27&view=diff
==============================================================================
--- Trunk/ControlPad/splashitem.cpp (original)
+++ Trunk/ControlPad/splashitem.cpp Tue Aug 18 20:26:00 2009
@@ -53,7 +53,7 @@
     timeLine->setCurveShape(QTimeLine::EaseInCurve);
     connect(timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(setValue(qreal)));
 
-    text = tr("yeeeeharrrr");
+    text = tr("Loading...");
     resize(400, 175);
 }
 
@@ -66,7 +66,7 @@
     painter->drawRoundRect(3, -100 + 3, 400 - 6, 250 - 6);
 
     QRectF textRect = rect().adjusted(10, 10, -10, -10);
-    int flags = Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap;
+    int flags = Qt::AlignTop | Qt::AlignCenter | Qt::TextWordWrap;
 
     QFont font;
     font.setPixelSize(18);

Modified: Trunk/ControlPad/splashitem.h
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/Trunk/ControlPad/splashitem.h?rev=27&root=xBeeHome&r1=26&r2=27&view=diff
==============================================================================
--- Trunk/ControlPad/splashitem.h (original)
+++ Trunk/ControlPad/splashitem.h Tue Aug 18 20:26:00 2009
@@ -49,6 +49,7 @@
 public:
     SplashItem(QGraphicsItem *parent = 0);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    void setText(QString what) { this->text = what; };
 
 protected:
     void keyPressEvent(QKeyEvent *event);