[SCM] qstopmotion/master: attached
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Sat Nov 5 10:02:43 UTC 2016
The following commit has been merged in the master branch:
commit 253e18bf44647481afd75a5ad738c469401d4ea4
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Sat Nov 5 10:55:31 2016 +0100
attached
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 5538339..4aba80c 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -70,3 +70,132 @@ Index: qstopmotion/src/frontends/qtfrontend/qtfrontend.cpp
return;
}
QDebug(QtDebugMsg) << "QtFrontend::test of level: " << level << " --> testSize: " << testSize;
+Index: qstopmotion/manual/adding_sound.html
+===================================================================
+--- qstopmotion.orig/manual/adding_sound.html
++++ qstopmotion/manual/adding_sound.html
+@@ -22,8 +22,8 @@
+ </DIV>
+ <DIV CLASS="section">
+ <H1 CLASS="section">X. Adding sound</H1>
+- <P>You also can add sound to your animations. Before you can do this however you need to have a frame to attatch the sound to. Therefore you should add some frames from the harddrive or webcamera first.</P>
+- <P>When you have one or more frames you can add a sound by double clicking with the mouse on the frame to attatch the sound to. You will then get a menu where you can add sounds. When running the animation the sound will be played from this frame and until the sound is completed or the animation is at an end.</P>
++ <P>You also can add sound to your animations. Before you can do this however you need to have a frame to attach the sound to. Therefore you should add some frames from the harddrive or webcamera first.</P>
++ <P>When you have one or more frames you can add a sound by double clicking with the mouse on the frame to attach the sound to. You will then get a menu where you can add sounds. When running the animation the sound will be played from this frame and until the sound is completed or the animation is at an end.</P>
+ <DIV CLASS="note">
+ <TABLE CLASS="note" WIDTH="100%" BORDER="0">
+ <TR>
+Index: qstopmotion/src/frontends/observer.h
+===================================================================
+--- qstopmotion.orig/src/frontends/observer.h
++++ qstopmotion/src/frontends/observer.h
+@@ -34,7 +34,7 @@ class Exposure;
+ * The observer interface. All classes who wants to be notified when something
+ * changes in the animationmodel has to implement from this class.
+ *
+- * The observers implemented with this class also has to be attatched to the
++ * The observers implemented with this class also has to be attached to the
+ * animationmodel.
+ *
+ * The observer is implemented with strong use of the push model. Although this
+Index: qstopmotion/src/frontends/qtfrontend/frameview/frameviewinterface.cpp
+===================================================================
+--- qstopmotion.orig/src/frontends/qtfrontend/frameview/frameviewinterface.cpp
++++ qstopmotion/src/frontends/qtfrontend/frameview/frameviewinterface.cpp
+@@ -56,9 +56,9 @@ FrameViewInterface::FrameViewInterface(F
+
+ setNormalRatio();
+
+- frontend->getView()->attatch(this);
++ frontend->getView()->attach(this);
+
+- qDebug() << "FrameViewInterface::Constructor --> FrameView is attatched to the ViewFacade";
++ qDebug() << "FrameViewInterface::Constructor --> FrameView is attached to the ViewFacade";
+
+ connect(&grabTimer, SIGNAL(timeout()), this, SLOT(redraw()));
+ connect(&playbackTimer, SIGNAL(timeout()), this, SLOT(nextPlayBack()));
+Index: qstopmotion/src/frontends/qtfrontend/timeline/thumbview.h
+===================================================================
+--- qstopmotion.orig/src/frontends/qtfrontend/timeline/thumbview.h
++++ qstopmotion/src/frontends/qtfrontend/timeline/thumbview.h
+@@ -69,8 +69,8 @@ public:
+
+ /**
+ * Abstract function for telling a exposurethumbview that it has one or more sounds
+- * attatched to it.
+- * @param hasSounds true if the frame has one or more sounds attatched to it.
++ * attached to it.
++ * @param hasSounds true if the frame has one or more sounds attached to it.
+ */
+ virtual void setHasSounds(bool hasSounds);
+
+Index: qstopmotion/src/frontends/qtfrontend/timeline/timeline.cpp
+===================================================================
+--- qstopmotion.orig/src/frontends/qtfrontend/timeline/timeline.cpp
++++ qstopmotion/src/frontends/qtfrontend/timeline/timeline.cpp
+@@ -127,8 +127,8 @@ TimeLine::TimeLine(Frontend* f, QWidget
+ setBackgroundRole(QPalette::Dark);
+ setAcceptDrops(true);
+
+- qDebug() << "TimeLine::Constructor --> TimeLine is attatched to the model";
+- frontend->getView()->attatch(this);
++ qDebug() << "TimeLine::Constructor --> TimeLine is attached to the model";
++ frontend->getView()->attach(this);
+
+ qDebug() << "TimeLine::Constructor --> End";
+ }
+Index: qstopmotion/src/frontends/qtfrontend/tooltabs/projecttab.cpp
+===================================================================
+--- qstopmotion.orig/src/frontends/qtfrontend/tooltabs/projecttab.cpp
++++ qstopmotion/src/frontends/qtfrontend/tooltabs/projecttab.cpp
+@@ -80,7 +80,7 @@ ProjectTab::ProjectTab(Frontend *f,
+ makeGUI();
+ retranslateStrings();
+ enableTab();
+- frontend->getView()->attatch(this);
++ frontend->getView()->attach(this);
+
+ qDebug() << "ProjectTab::Constructor --> End";
+ }
+Index: qstopmotion/src/frontends/viewfacade.cpp
+===================================================================
+--- qstopmotion.orig/src/frontends/viewfacade.cpp
++++ qstopmotion/src/frontends/viewfacade.cpp
+@@ -53,17 +53,17 @@ DomainFacade* ViewFacade::getProject()
+ }
+
+
+-void ViewFacade::attatch(Observer *o)
++void ViewFacade::attach(Observer *o)
+ {
+- qDebug() << "ViewFacade::attatch --> Start";
++ qDebug() << "ViewFacade::attach --> Start";
+
+ if (o != NULL) {
+ observers.append(o);
+ } else {
+- qDebug() << "ViewFacade::attatch --> Trying to attatch a NULL pointer to the ViewFacade";
++ qDebug() << "ViewFacade::attach --> Trying to attach a NULL pointer to the ViewFacade";
+ }
+
+- qDebug() << "ViewFacade::attatch --> End";
++ qDebug() << "ViewFacade::attach --> End";
+ }
+
+
+Index: qstopmotion/src/frontends/viewfacade.h
+===================================================================
+--- qstopmotion.orig/src/frontends/viewfacade.h
++++ qstopmotion/src/frontends/viewfacade.h
+@@ -72,9 +72,9 @@ public:
+ /**
+ * Attatches a new observer to the model. The observer will be notified
+ * when something is changed in the model.
+- * @param o the observer to be attatched to the model.
++ * @param o the observer to be attached to the model.
+ */
+- void attatch(Observer *o);
++ void attach(Observer *o);
+
+ /**
+ * Detatches an observer from the model. The observer will no longer be
--
qstopmotion packaging
More information about the pkg-multimedia-commits
mailing list