[Geesas-Devs] SF.net SVN: geesas:[8] pencilanimation/src/interface

[<cr...@us...>]

Revision: 8
          http://geesas.svn.sourceforge.net/geesas/?rev=8&view=rev
Author:   creek23
Date:     2009-02-07 21:12:21 +0000 (Sat, 07 Feb 2009)

Log Message:
-----------
added forceUpdateLength.

Modified Paths:
--------------
    pencilanimation/src/interface/timeline.cpp
    pencilanimation/src/interface/timeline.h

Modified: pencilanimation/src/interface/timeline.cpp
===================================================================
--- pencilanimation/src/interface/timeline.cpp	2009-02-07 17:08:42 UTC (rev 7)
+++ pencilanimation/src/interface/timeline.cpp	2009-02-07 21:12:21 UTC (rev 8)
@@ -700,25 +700,22 @@
 }
 
 void TimeLineCells::lengthChange(QString x) {
-	addedFrame(x);
-	/*
-		bool ok;
-		int dec = x.toInt(&ok, 10);
-		frameLength=dec;
-		timeLine->updateLength(frameLength);
-		//setMinimumSize(dec*frameSize,40);
-		//setFixedWidth(dec*frameSize);
-		updateContent();
-		QSettings settings("Pencil","Pencil");
-		settings.setValue("length", dec);
-	 */
+	bool ok;
+	int dec = x.toInt(&ok, 10);
+	frameLength=dec;
+	timeLine->updateLength(frameLength);
+	//setMinimumSize(dec*frameSize,40);
+	//setFixedWidth(dec*frameSize);
+	updateContent();
+	QSettings settings("Pencil","Pencil");
+	settings.setValue("length", dec);
 }
 
-void TimeLineCells::addedFrame(QString newLength) {
+void TimeLine::forceUpdateLength(QString newLength) {
 	bool ok;
 	int dec = newLength.toInt(&ok, 10);
-	frameLength=dec;
-	timeLine->updateLength(frameLength);
+	
+	updateLength(dec);
 	updateContent();
 	QSettings settings("Pencil","Pencil");
 	settings.setValue("length", dec);

Modified: pencilanimation/src/interface/timeline.h
===================================================================
--- pencilanimation/src/interface/timeline.h	2009-02-07 17:08:42 UTC (rev 7)
+++ pencilanimation/src/interface/timeline.h	2009-02-07 21:12:21 UTC (rev 8)
@@ -45,7 +45,6 @@
 	int getMouseMoveY() { return mouseMoveY; }
 	int getOffsetY() { return offsetY; }
 	int getLayerHeight() { return layerHeight; }
-	void addedFrame(QString newLength); //when Animation -> Add Frame is clicked, this will auto update timeline
 
 signals:
 	void mouseMovedY(int);
@@ -53,7 +52,7 @@
 public slots:
 	void updateContent();
 	void updateFrame(int frameNumber);
-	void lengthChange(QString); //previous content is now on addedFrame. this will call addedFrame instead
+	void lengthChange(QString); //try to remove content and call TimeLine::forceUpdateLength instead
 	void frameSizeChange(int);
 	void fontSizeChange(int);
 	void scrubChange(int);
@@ -116,7 +115,6 @@
 	void fpsClick(int);
 	void onionPrevClick();
 	void onionNextClick();
-	
 
 public slots:
 	void updateFrame(int frameNumber);
@@ -131,6 +129,7 @@
 	//int currentFrame;
 	//int currentLayer;
 	bool scrubbing;
+	void forceUpdateLength(QString newLength); //when Animation -> Add Frame is clicked, this will auto update timeline
 
 protected:
 	void resizeEvent(QResizeEvent *event);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.