geesas-devs Mailing List for GPL SWF Authoring Software (Page 3)
Status: Abandoned
Brought to you by:
creek23
Menu
▾
▴
geesas-devs — Mailing list for Geesas development plan
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
(53) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(5) |
Aug
(3) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(18) |
Aug
(4) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: SourceForge.net <no...@so...> - 2009-02-19 07:39:12
|
Read and respond to this message at: https://sourceforge.net/forum/message.php?msg_id=6463279 By: creek23 Oh, that. You have to compile libming 0.4.2 -- which you can get it from: http://sourceforge.net/project/showfiles.php?group_id=18365&package_id=187304&re lease_id=627077 I made Clash to use the latest ming library to maximize the SWF export capability -- as you would know, this project is aimed to produce an SWF authoring software (the interactive ones, which can be use for games, websites and such) ______________________________________________________________________ You are receiving this email because you elected to monitor this forum. To stop monitoring this forum, login to SourceForge.net and visit: https://sourceforge.net/forum/unmonitor.php?forum_id=917628 |
|
From: SourceForge.net <no...@so...> - 2009-02-19 04:01:54
|
Read and respond to this message at: https://sourceforge.net/forum/message.php?msg_id=6462167 By: nobody I'm using Ubuntu Hardy 8.04, and yes, I do have libqt4-core installed, along with libqt4-opengl. Regardless, I keep running into this error whenever I try to use the debian. I've also tried compiling from source, but the make always stops with error: ‘SWFMovieClip’ has not been declared followed by a long string of errors related to it. What library can I find the SWFMovieClip in? I do have Ming installed through the repos, by the way. Thanks. ______________________________________________________________________ You are receiving this email because you elected to monitor this forum. To stop monitoring this forum, login to SourceForge.net and visit: https://sourceforge.net/forum/unmonitor.php?forum_id=917628 |
|
From: <cr...@us...> - 2009-02-17 15:51:45
|
Revision: 38
http://geesas.svn.sourceforge.net/geesas/?rev=38&view=rev
Author: creek23
Date: 2009-02-17 15:51:41 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
added createC7Z and openC7Z
Modified Paths:
--------------
pencilanimation/src/external/linux/linux.cpp
Modified: pencilanimation/src/external/linux/linux.cpp
===================================================================
--- pencilanimation/src/external/linux/linux.cpp 2009-02-15 23:29:18 UTC (rev 37)
+++ pencilanimation/src/external/linux/linux.cpp 2009-02-17 15:51:41 UTC (rev 38)
@@ -71,3 +71,86 @@
for(int i=0;i<entries.size();i++)
dir.remove(entries[i]);
}
+
+bool Editor::createC7Z(QString filePath) {
+ if(!filePath.endsWith(".c7z", Qt::CaseInsensitive)) {
+ filePath = filePath + ".c7z";
+ }
+ bool result = false;
+ QString tempPath = QDir::temp().absolutePath()+"/clash/";
+ QDir dir2(filePath);
+ if (QFile::exists("/usr/bin/7z") == true) {
+ if (QFile::exists(filePath) == true) { dir2.remove(filePath); }
+
+ QProcess c7z;
+ c7z.start("7z a \"" + filePath + "\" -y -w " + tempPath + "*");
+ if (c7z.waitForStarted() == true) {
+ //wait for the program to finish for 5 mins. if it didnt, force quit.
+ if (c7z.waitForFinished(300000) == true) {
+ qDebug() << "C7Z saved.";
+ result = true;
+ } else {
+ qDebug() << "ERROR: 7z did not finish executing.";
+ }
+ } else {
+ qDebug() << "ERROR: Could not execute 7z.";
+ }
+ // --------- Clean up temp directory ---------
+ QDir dir__(tempPath+"content.data");
+ QStringList filtername2("*.*");
+ QStringList entries2 = dir__.entryList(filtername2,QDir::Files,QDir::Type);
+ for(int i=0;i<entries2.size();i++)
+ dir__.remove(entries2[i]);
+ QDir dir(tempPath);
+ QStringList filtername("*");
+ QStringList entries = dir.entryList(filtername,QDir::Files,QDir::Type);
+ for(int i=0;i<entries.size();i++)
+ dir.remove(entries[i]);
+ } else {
+ qDebug() << "Please install 7zip: sudo apt-get install p7zip-full";
+ }
+ qDebug() << "-----";
+ return result;
+}
+
+bool Editor::openC7Z(QString filePath) {
+ if(!filePath.endsWith(".c7z", Qt::CaseInsensitive)) {
+ filePath = filePath + ".c7z";
+ }
+ bool result = false;
+ QString tempPath = QDir::temp().absolutePath()+"/clash/";
+ QDir dir2(filePath);
+ if (QFile::exists("/usr/bin/7z") == true) {
+ // --------- Clean up working directory ---------
+ QDir dir__(tempPath+"content.data");
+ QStringList filtername2("*.*");
+ QStringList entries2 = dir__.entryList(filtername2,QDir::Files,QDir::Type);
+ for(int i=0;i<entries2.size();i++)
+ dir__.remove(entries2[i]);
+ QDir dir(tempPath);
+ QStringList filtername("*");
+ QStringList entries = dir.entryList(filtername,QDir::Files,QDir::Type);
+ for(int i=0;i<entries.size();i++)
+ dir.remove(entries[i]);
+ //if (QFile::exists(filePath) == true) { dir2.remove(filePath); }
+
+ QProcess c7z;
+ c7z.start("7z x \"" + filePath + "\" -y -o" + tempPath);
+ if (c7z.waitForStarted() == true) {
+ //wait for the program to finish for 5 mins. if it didnt, force quit.
+ if (c7z.waitForFinished(300000) == true) {
+ qDebug() << "Opened C7Z.";
+ result = true;
+ } else {
+ qDebug() << "ERROR: 7z did not finish executing.";
+ }
+ } else {
+ qDebug() << "ERROR: Could not execute 7z.";
+ }
+
+ } else {
+ qDebug() << "Please install 7zip: sudo apt-get install p7zip-full";
+ }
+ qDebug() << "-----";
+ return result;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: SourceForge.net <no...@so...> - 2009-02-17 00:53:06
|
Read and respond to this message at: https://sourceforge.net/forum/message.php?msg_id=6444506 By: creek23 * your nick :P ______________________________________________________________________ You are receiving this email because you elected to monitor this forum. To stop monitoring this forum, login to SourceForge.net and visit: https://sourceforge.net/forum/unmonitor.php?forum_id=917628 |
|
From: SourceForge.net <no...@so...> - 2009-02-17 00:52:14
|
Read and respond to this message at: https://sourceforge.net/forum/message.php?msg_id=6444502 By: creek23 Hi, thanks for dropping by... err... (you could have at least posted you nick) ______________________________________________________________________ You are receiving this email because you elected to monitor this forum. To stop monitoring this forum, login to SourceForge.net and visit: https://sourceforge.net/forum/unmonitor.php?forum_id=917628 |
|
From: SourceForge.net <no...@so...> - 2009-02-16 21:14:56
|
Read and respond to this message at: https://sourceforge.net/forum/message.php?msg_id=6443275 By: nobody Cool, it's good to see it carry on with development. ______________________________________________________________________ You are receiving this email because you elected to monitor this forum. To stop monitoring this forum, login to SourceForge.net and visit: https://sourceforge.net/forum/unmonitor.php?forum_id=917628 |
|
From: <cr...@us...> - 2009-02-15 23:29:21
|
Revision: 37
http://geesas.svn.sourceforge.net/geesas/?rev=37&view=rev
Author: creek23
Date: 2009-02-15 23:29:18 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
added Ming to dependencies in About dialog.
Modified Paths:
--------------
pencilanimation/src/interface/editor.cpp
Modified: pencilanimation/src/interface/editor.cpp
===================================================================
--- pencilanimation/src/interface/editor.cpp 2009-02-15 23:09:14 UTC (rev 36)
+++ pencilanimation/src/interface/editor.cpp 2009-02-15 23:29:18 UTC (rev 37)
@@ -2,6 +2,7 @@
Pencil - Traditional Animation Software
Copyright (C) 2005-2007 Patrick Corrieri & Pascal Naidon
+Copyright (C) 2009 Mj Mendoza IV
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -240,7 +241,7 @@
void Editor::openDocument()
{
if (maybeSave()) {
- QSettings settings("PClash","Clash");
+ QSettings settings("Clash","Clash");
QString myPath = settings.value("lastFilePath", QVariant(QDir::homePath())).toString();
QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), myPath);
if (!fileName.isEmpty()) {
@@ -764,10 +765,10 @@
QMessageBox::about(this, tr("Clash v0.4.5b-rev6"),
tr("<table style='background-color: #DDDDDD' border='0'><tr><td valign='top'>"
"<img src=':icons/logo.png' width='318' height='123' border='0'><br></td></tr><tr><td>"
- "Version: <b>0.9.2b-rev21</b><br>"
- "<b>Developers:</b><br>"
+ "<b>Version:</b> 0.9.2b-rev21<br>"
+ "<b>Developers:</b> "
"<i>Mj Mendoza IV</i>, <i>Pascal Naidon</i>, <i>Patrick Corrieri</i><br><br>"
- "<b>Clash uses:</b> Qt, FFmpeg, 7zip<br><br>"
+ "<b>Clash uses:</b> Qt, Ming, FFmpeg, 7zip<br><br>"
"<a href='http://tinyurl.com/pencilanimation'>http://tinyurl.com/pencilanimation</a><br><br>"
"Distributed under the <a href='http://www.gnu.org/copyleft/gpl.html'>GPL License</a>."
"</td></tr></table>"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-15 23:09:35
|
Revision: 36
http://geesas.svn.sourceforge.net/geesas/?rev=36&view=rev
Author: creek23
Date: 2009-02-15 23:09:14 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Modified Paths:
--------------
pencilanimation/src/interface/mainwindow.cpp
Modified: pencilanimation/src/interface/mainwindow.cpp
===================================================================
--- pencilanimation/src/interface/mainwindow.cpp 2009-02-15 22:51:49 UTC (rev 35)
+++ pencilanimation/src/interface/mainwindow.cpp 2009-02-15 23:09:14 UTC (rev 36)
@@ -495,7 +495,7 @@
}
void MainWindow::readSettings() {
- QSettings settings("Pencil", "Pencil");
+ QSettings settings("Clash", "Clash");
QRect desktopRect = QApplication::desktop()->screenGeometry();
desktopRect.adjust(80,80,-80,-80);
//QPoint pos = settings.value("editorPosition", QPoint( qMax(0, (desktopRect.width()-800)/2), qMax(0, (desktopRect.height()-600)/2) )).toPoint();
@@ -515,7 +515,7 @@
}
void MainWindow::writeSettings() {
- QSettings settings("Pencil", "Pencil");
+ QSettings settings("Clash", "Clash");
settings.setValue("editorPosition", pos());
settings.setValue("editorSize", size());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-15 22:51:51
|
Revision: 35
http://geesas.svn.sourceforge.net/geesas/?rev=35&view=rev
Author: creek23
Date: 2009-02-15 22:51:49 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
added possibility to select adjacent frames from anywhere in the middle.
Modified Paths:
--------------
pencilanimation/src/structure/layerimage.cpp
Modified: pencilanimation/src/structure/layerimage.cpp
===================================================================
--- pencilanimation/src/structure/layerimage.cpp 2009-02-15 09:54:19 UTC (rev 34)
+++ pencilanimation/src/structure/layerimage.cpp 2009-02-15 22:51:49 UTC (rev 35)
@@ -2,6 +2,7 @@
Pencil - Traditional Animation Software
Copyright (C) 2005-2007 Patrick Corrieri & Pascal Naidon
+Copyright (C) 2009 Mj Mendoza IV
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -28,6 +29,7 @@
LayerImage::~LayerImage() {
}
+//instead of dealing with 1-5, this will give 0-4. to avoid conflict on base (0 or 1)
int LayerImage::getIndexAtFrame(int frameNumber) {
int index = -1;
for(int i=0; i< framesPosition.size(); i++) {
@@ -145,16 +147,39 @@
void LayerImage::mousePress(QMouseEvent *event, int frameNumber) {
frameClicked = frameNumber;
int index = getIndexAtFrame(frameNumber);
+ int i;
if(index == -1) {
+ //when no frame was clicked, unhighlight selected frames
deselectAllFrames();
+ } else if ( (event->modifiers() == Qt::ShiftModifier) ) {
+ //user selects a range of adjacent frames
+ for(i=0; i < index-1; i++) {
+ //highlight all adjacent frames on the left of the clicked frame
+ if (framesSelected[i] == true) {
+ framesSelected[i+1] = true;
+ } else { qDebug() << ">nope"; }
+ }
+ for(i=framesSelected.size()-1; i > index+1; i--) {
+ //highlight all adjacent frames on the right of the clicked frame
+ if (framesSelected[i] == true) {
+ framesSelected[i-1] = true;
+ } else {
+ qDebug() << ">>oopsie!";
+ }
+ }
+ framesSelected[index] = true;
} else {
- if( (event->modifiers() != Qt::ShiftModifier) && (!framesSelected.at(index)) && (event->buttons() != Qt::RightButton) ) {
+ //select non-adjacent frames one-frame-per-click
+ if ( (!framesSelected.at(index)) && (event->buttons() != Qt::RightButton) ) {
+ //...but just select 1 if user did not right-click
deselectAllFrames();
}
+
framesSelected[index] = true;
}
if(event->modifiers() == Qt::AltModifier) {
- for(int i=index; i < framesPosition.size(); i++) {
+ //selects all fram from the clicked frame to the last frame; same as double-clicking the frame
+ for(i=index; i < framesPosition.size(); i++) {
framesSelected[i] = true;
}
}
@@ -279,7 +304,7 @@
}
bool LayerImage::saveImages(QString path, int layerNumber) {
- qDebug() << "Save images... ";
+ //qDebug() << "Save images... ";
QDir dir(path);
//qDebug() << dir.exists() << dir.path();
//qDebug() << framesPosition;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-15 09:54:21
|
Revision: 34
http://geesas.svn.sourceforge.net/geesas/?rev=34&view=rev
Author: creek23
Date: 2009-02-15 09:54:19 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
execute Clash.exe instead of Pencil.exe
Modified Paths:
--------------
pencilanimation/test.bat
Modified: pencilanimation/test.bat
===================================================================
--- pencilanimation/test.bat 2009-02-14 20:39:51 UTC (rev 33)
+++ pencilanimation/test.bat 2009-02-15 09:54:19 UTC (rev 34)
@@ -1,4 +1,4 @@
@echo off
cd debug
-gdb pencil
+gdb clash
cd ..
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 20:39:54
|
Revision: 33
http://geesas.svn.sourceforge.net/geesas/?rev=33&view=rev
Author: creek23
Date: 2009-02-14 20:39:51 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Removed Paths:
-------------
pencilanimation/pencil.ico
pencilanimation/pencil.pro
pencilanimation/pencil.qrc
pencilanimation/pencil.rc
Deleted: pencilanimation/pencil.ico
===================================================================
(Binary files differ)
Deleted: pencilanimation/pencil.pro
===================================================================
--- pencilanimation/pencil.pro 2009-02-14 20:38:34 UTC (rev 32)
+++ pencilanimation/pencil.pro 2009-02-14 20:39:51 UTC (rev 33)
@@ -1,90 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) sam. janv. 13 17:20:35 2007
-######################################################################
-
-CONFIG += qt debug console
-TEMPLATE = app
-TARGET = Pencil
-DEPENDPATH += . src
-INCLUDEPATH += . src \
- src/external/flash \
- src/external/linux \
- src/external/macosx \
- src/external/win32 \
- src/graphics \
- src/graphics/bitmap \
- src/graphics/vector \
- src/interface \
- src/structure
-
-# Input
-HEADERS += src/interfaces.h \
- src/external/flash/flash.h \
- src/graphics/bitmap/bitmapimage.h \
- src/graphics/vector/bezierarea.h \
- src/graphics/vector/beziercurve.h \
- src/graphics/vector/colourref.h \
- src/graphics/vector/gradient.h \
- src/graphics/vector/vectorimage.h \
- src/graphics/vector/vertexref.h \
- src/structure/layer.h \
- src/structure/layerbitmap.h \
- src/structure/layercamera.h \
- src/structure/layerimage.h \
- src/structure/layersound.h \
- src/structure/layervector.h \
- src/structure/object.h \
- src/interface/editor.h \
- src/interface/mainwindow.h \
- src/interface/palette.h \
- src/interface/preferences.h \
- src/interface/scribblearea.h \
- src/interface/timeline.h \
- src/interface/timecontrols.h \
- src/interface/toolset.h
-SOURCES += src/external/flash/flash.cpp \
- src/graphics/bitmap/blur.cpp \
- src/graphics/bitmap/bitmapimage.cpp \
- src/graphics/vector/bezierarea.cpp \
- src/graphics/vector/beziercurve.cpp \
- src/graphics/vector/colourref.cpp \
- src/graphics/vector/gradient.cpp \
- src/graphics/vector/vectorimage.cpp \
- src/graphics/vector/vertexref.cpp \
- src/structure/layer.cpp \
- src/structure/layerbitmap.cpp \
- src/structure/layercamera.cpp \
- src/structure/layerimage.cpp \
- src/structure/layersound.cpp \
- src/structure/layervector.cpp \
- src/structure/object.cpp \
- src/interface/editor.cpp \
- src/interface/mainwindow.cpp \
- src/interface/palette.cpp \
- src/interface/preferences.cpp \
- src/interface/scribblearea.cpp \
- src/interface/timeline.cpp \
- src/interface/timecontrols.cpp \
- src/interface/toolset.cpp \
- src/main.cpp
-win32 {
- INCLUDEPATH += . libwin32
- SOURCES += src/external/win32/win32.cpp
- LIBS += -Llibwin32 -lming -lpng
- RC_FILE = pencil.rc
-}
-macx {
- INCLUDEPATH += . libmacosx
- HEADERS += src/external/macosx/style.h
- SOURCES += src/external/macosx/macosx.cpp \
- src/external/macosx/style.cpp
- LIBS += -Llibmacosx -lming
- RC_FILE = pencil.icns
-}
-linux-g++ {
- INCLUDEPATH += . liblinux
- SOURCES += src/external/linux/linux.cpp
- LIBS += -Lliblinux -lming -lpng
-}
-RESOURCES += pencil.qrc
-QT += xml opengl
Deleted: pencilanimation/pencil.qrc
===================================================================
--- pencilanimation/pencil.qrc 2009-02-14 20:38:34 UTC (rev 32)
+++ pencilanimation/pencil.qrc 2009-02-14 20:39:51 UTC (rev 33)
@@ -1,64 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
- <qresource>
- <file>icons/arrow.png</file>
-
- <file>icons/clear.png</file>
- <file>icons/remove.png</file>
- <file>icons/add.png</file>
- <file>icons/eraser.png</file>
- <file>icons/pencil2.png</file>
- <file>icons/house.png</file>
- <file>icons/select.png</file>
- <file>icons/move.png</file>
- <file>icons/pen.png</file>
- <file>icons/brush.png</file>
- <file>icons/polyline.png</file>
- <file>icons/eraser2.png</file>
- <file>icons/hand.png</file>
- <file>icons/bucket.png</file>
- <file>icons/bucketTool.png</file>
- <file>icons/eyedropper.png</file>
- <file>icons/thinlines5.png</file>
- <file>icons/outlines5.png</file>
- <file>icons/mirror.png</file>
- <file>icons/magnify.png</file>
- <file>icons/smudge.png</file>
-
- <file>icons/onionPrev.png</file>
- <file>icons/onionNext.png</file>
-
- <file>icons/layer-vector.png</file>
- <file>icons/layer-bitmap.png</file>
- <file>icons/layer-sound.png</file>
- <file>icons/layer-camera.png</file>
-
- <file>icons/controls/play.png</file>
- <file>icons/controls/loop.png</file>
- <file>icons/controls/sound.png</file>
- <file>icons/controls/separator.png</file>
-
- <file>icons/prefspencil.png</file>
- <file>icons/prefstimeline.png</file>
- <file>icons/prefs-files.png</file>
-
- <file>background/weave.jpg</file>
- <file>background/dots.png</file>
-
- <file>icons/logo.png</file>
- <file>icons/icon.png</file>
-
- <file>icons/aqua.png</file>
-
-
- <file>icons/open.png</file>
- <file>icons/copy.png</file>
- <file>icons/paste.png</file>
- <file>icons/next.png</file>
- <file>icons/prev.png</file>
- <file>icons/save.png</file>
- <file>icons/saveas.png</file>
- <file>icons/undo.png</file>
- <file>icons/redo.png</file>
- <file>icons/new.png</file>
- </qresource>
-</RCC>
Deleted: pencilanimation/pencil.rc
===================================================================
--- pencilanimation/pencil.rc 2009-02-14 20:38:34 UTC (rev 32)
+++ pencilanimation/pencil.rc 2009-02-14 20:39:51 UTC (rev 33)
@@ -1 +0,0 @@
-IDI_ICON1 ICON DISCARDABLE "pencil.ico"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 20:38:38
|
Revision: 32
http://geesas.svn.sourceforge.net/geesas/?rev=32&view=rev
Author: creek23
Date: 2009-02-14 20:38:34 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Added Paths:
-----------
pencilanimation/Clash.pro
pencilanimation/clash.qrc
pencilanimation/clash.rc
Added: pencilanimation/Clash.pro
===================================================================
--- pencilanimation/Clash.pro (rev 0)
+++ pencilanimation/Clash.pro 2009-02-14 20:38:34 UTC (rev 32)
@@ -0,0 +1,90 @@
+######################################################################
+# Automatically generated by qmake (2.01a) sam. janv. 13 17:20:35 2007
+######################################################################
+
+CONFIG += qt debug console
+TEMPLATE = app
+TARGET = Clash
+DEPENDPATH += . src
+INCLUDEPATH += . src \
+ src/external/flash \
+ src/external/linux \
+ src/external/macosx \
+ src/external/win32 \
+ src/graphics \
+ src/graphics/bitmap \
+ src/graphics/vector \
+ src/interface \
+ src/structure
+
+# Input
+HEADERS += src/interfaces.h \
+ src/external/flash/flash.h \
+ src/graphics/bitmap/bitmapimage.h \
+ src/graphics/vector/bezierarea.h \
+ src/graphics/vector/beziercurve.h \
+ src/graphics/vector/colourref.h \
+ src/graphics/vector/gradient.h \
+ src/graphics/vector/vectorimage.h \
+ src/graphics/vector/vertexref.h \
+ src/structure/layer.h \
+ src/structure/layerbitmap.h \
+ src/structure/layercamera.h \
+ src/structure/layerimage.h \
+ src/structure/layersound.h \
+ src/structure/layervector.h \
+ src/structure/object.h \
+ src/interface/editor.h \
+ src/interface/mainwindow.h \
+ src/interface/palette.h \
+ src/interface/preferences.h \
+ src/interface/scribblearea.h \
+ src/interface/timeline.h \
+ src/interface/timecontrols.h \
+ src/interface/toolset.h
+SOURCES += src/external/flash/flash.cpp \
+ src/graphics/bitmap/blur.cpp \
+ src/graphics/bitmap/bitmapimage.cpp \
+ src/graphics/vector/bezierarea.cpp \
+ src/graphics/vector/beziercurve.cpp \
+ src/graphics/vector/colourref.cpp \
+ src/graphics/vector/gradient.cpp \
+ src/graphics/vector/vectorimage.cpp \
+ src/graphics/vector/vertexref.cpp \
+ src/structure/layer.cpp \
+ src/structure/layerbitmap.cpp \
+ src/structure/layercamera.cpp \
+ src/structure/layerimage.cpp \
+ src/structure/layersound.cpp \
+ src/structure/layervector.cpp \
+ src/structure/object.cpp \
+ src/interface/editor.cpp \
+ src/interface/mainwindow.cpp \
+ src/interface/palette.cpp \
+ src/interface/preferences.cpp \
+ src/interface/scribblearea.cpp \
+ src/interface/timeline.cpp \
+ src/interface/timecontrols.cpp \
+ src/interface/toolset.cpp \
+ src/main.cpp
+win32 {
+ INCLUDEPATH += . libwin32
+ SOURCES += src/external/win32/win32.cpp
+ LIBS += -Llibwin32 -lming -lpng
+ RC_FILE = clash.rc
+}
+macx {
+ INCLUDEPATH += . libmacosx
+ HEADERS += src/external/macosx/style.h
+ SOURCES += src/external/macosx/macosx.cpp \
+ src/external/macosx/style.cpp
+ LIBS += -Llibmacosx -lming
+ RC_FILE = clash.icns
+}
+linux-g++ {
+ INCLUDEPATH += . liblinux
+ SOURCES += src/external/linux/linux.cpp
+ LIBS += -Lliblinux -lming -lpng
+}
+RESOURCES += clash.qrc
+QT += xml opengl
Added: pencilanimation/clash.qrc
===================================================================
--- pencilanimation/clash.qrc (rev 0)
+++ pencilanimation/clash.qrc 2009-02-14 20:38:34 UTC (rev 32)
@@ -0,0 +1,64 @@
+<!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+ <file>icons/arrow.png</file>
+
+ <file>icons/clear.png</file>
+ <file>icons/remove.png</file>
+ <file>icons/add.png</file>
+ <file>icons/eraser.png</file>
+ <file>icons/pencil2.png</file>
+ <file>icons/house.png</file>
+ <file>icons/select.png</file>
+ <file>icons/move.png</file>
+ <file>icons/pen.png</file>
+ <file>icons/brush.png</file>
+ <file>icons/polyline.png</file>
+ <file>icons/eraser2.png</file>
+ <file>icons/hand.png</file>
+ <file>icons/bucket.png</file>
+ <file>icons/bucketTool.png</file>
+ <file>icons/eyedropper.png</file>
+ <file>icons/thinlines5.png</file>
+ <file>icons/outlines5.png</file>
+ <file>icons/mirror.png</file>
+ <file>icons/magnify.png</file>
+ <file>icons/smudge.png</file>
+
+ <file>icons/onionPrev.png</file>
+ <file>icons/onionNext.png</file>
+
+ <file>icons/layer-vector.png</file>
+ <file>icons/layer-bitmap.png</file>
+ <file>icons/layer-sound.png</file>
+ <file>icons/layer-camera.png</file>
+
+ <file>icons/controls/play.png</file>
+ <file>icons/controls/loop.png</file>
+ <file>icons/controls/sound.png</file>
+ <file>icons/controls/separator.png</file>
+
+ <file>icons/prefspencil.png</file>
+ <file>icons/prefstimeline.png</file>
+ <file>icons/prefs-files.png</file>
+
+ <file>background/weave.jpg</file>
+ <file>background/dots.png</file>
+
+ <file>icons/logo.png</file>
+ <file>icons/icon.png</file>
+
+ <file>icons/aqua.png</file>
+
+
+ <file>icons/open.png</file>
+ <file>icons/copy.png</file>
+ <file>icons/paste.png</file>
+ <file>icons/next.png</file>
+ <file>icons/prev.png</file>
+ <file>icons/save.png</file>
+ <file>icons/saveas.png</file>
+ <file>icons/undo.png</file>
+ <file>icons/redo.png</file>
+ <file>icons/new.png</file>
+ </qresource>
+</RCC>
Added: pencilanimation/clash.rc
===================================================================
--- pencilanimation/clash.rc (rev 0)
+++ pencilanimation/clash.rc 2009-02-14 20:38:34 UTC (rev 32)
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "clash.ico"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 20:37:32
|
Revision: 31
http://geesas.svn.sourceforge.net/geesas/?rev=31&view=rev
Author: creek23
Date: 2009-02-14 20:37:29 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Modified Paths:
--------------
pencilanimation/src/interface/timecontrols.cpp
Modified: pencilanimation/src/interface/timecontrols.cpp
===================================================================
--- pencilanimation/src/interface/timecontrols.cpp 2009-02-14 20:36:51 UTC (rev 30)
+++ pencilanimation/src/interface/timecontrols.cpp 2009-02-14 20:37:29 UTC (rev 31)
@@ -18,7 +18,7 @@
TimeControls::TimeControls(QWidget* parent) : QToolBar(parent) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
//QFrame* frame = new QFrame();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 20:36:55
|
Revision: 30
http://geesas.svn.sourceforge.net/geesas/?rev=30&view=rev
Author: creek23
Date: 2009-02-14 20:36:51 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
added createC7Z and openC7Z for Clash' C7Z format.
Modified Paths:
--------------
pencilanimation/src/interface/editor.cpp
pencilanimation/src/interface/editor.h
Modified: pencilanimation/src/interface/editor.cpp
===================================================================
--- pencilanimation/src/interface/editor.cpp 2009-02-14 20:35:24 UTC (rev 29)
+++ pencilanimation/src/interface/editor.cpp 2009-02-14 20:36:51 UTC (rev 30)
@@ -31,9 +31,10 @@
Editor::Editor(QMainWindow* parent)
{
+ qDebug() << "Clash 0.4.5b-rev6";
mainWindow = parent;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
object = NULL; // the editor is initialized with no object
savedName = "";
@@ -239,13 +240,13 @@
void Editor::openDocument()
{
if (maybeSave()) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("PClash","Clash");
QString myPath = settings.value("lastFilePath", QVariant(QDir::homePath())).toString();
QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), myPath);
if (!fileName.isEmpty()) {
bool ok = openObject(fileName);
if(!ok) {
- QMessageBox::warning(this, "Warning", "Pencil cannot read this file. If you want to import images, use the command import.");
+ QMessageBox::warning(this, "Warning", "Clash cannot read this file. If you want to import images, use the command import.");
newObject();
} else {
updateMaxFrame();
@@ -255,11 +256,11 @@
}
void Editor::openRecent() {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString myPath = settings.value("lastFilePath", QVariant(QDir::homePath())).toString();
bool ok = openObject(myPath);
if(!ok) {
- QMessageBox::warning(this, "Warning", "Pencil cannot read this file. If you want to import images, use the command import.");
+ QMessageBox::warning(this, "Warning", "Clash cannot read this file. If you want to import images, use the command import.");
newObject();
} else {
updateMaxFrame();
@@ -268,9 +269,7 @@
bool Editor::saveDocument()
{
- //QAction *action = qobject_cast<QAction *>(sender()); // ? old code from Patrick?
- //QByteArray fileFormat = action->data().toByteArray(); // ? old code from Patrick?
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString myPath = settings.value("lastFilePath", QVariant(QDir::homePath())).toString();
QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), myPath);
@@ -278,7 +277,7 @@
if (fileName.isEmpty()) {
return false;
} else {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("lastFilePath", QVariant(fileName));
return saveObject(fileName);
}
@@ -488,14 +487,14 @@
}
void Editor::changeAutosave(int x) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if (x==0) { autosave=false; settings.setValue("autosave","false"); }
else { autosave=true; settings.setValue("autosave","true"); }
}
void Editor::changeAutosaveNumber(int number) {
autosaveNumber = number;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("autosaveNumber", number);
}
@@ -756,32 +755,28 @@
void Editor::saveLength(QString x) {
bool ok;
int dec = x.toInt(&ok, 10);
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("length", dec);
}
void Editor::about()
{
- QMessageBox::about(this, tr("Pencil Animation 0.4.5b-rev5"),
+ QMessageBox::about(this, tr("Clash v0.4.5b-rev6"),
tr("<table style='background-color: #DDDDDD' border='0'><tr><td valign='top'>"
"<img src=':icons/logo.png' width='318' height='123' border='0'><br></td></tr><tr><td>"
- "Developed by: <i>Pascal Naidon</i> & <i>Patrick Corrieri</i><br>"
- "Patches by: <i>Mj Mendoza IV</i><br>"
- "Version: <b>0.4.5b-rev5</b> (6th February, 2008)<br><br>"
- "<b>Thanks to:</b><br>"
- "Trolltech for the Qt libraries<br>"
- "Roland for the Movie export functions<br>"
- "Axel for his help with Qt<br>"
- "Mark for his help with Qt and SVN<br><br>"
+ "Version: <b>0.9.2b-rev21</b><br>"
+ "<b>Developers:</b><br>"
+ "<i>Mj Mendoza IV</i>, <i>Pascal Naidon</i>, <i>Patrick Corrieri</i><br><br>"
+ "<b>Clash uses:</b> Qt, FFmpeg, 7zip<br><br>"
"<a href='http://tinyurl.com/pencilanimation'>http://tinyurl.com/pencilanimation</a><br><br>"
"Distributed under the <a href='http://www.gnu.org/copyleft/gpl.html'>GPL License</a>."
"</td></tr></table>"));
}
void Editor::helpBox() {
- QMessageBox::about(this, tr("Help"), tr("Some documentation is available online.<br><br>"
- "Please visit:<br>"
- "<a href='http://www.les-stooges.org/pascal/pencil'>http://www.les-stooges.org/pascal/pencil/</a>."));
+ QMessageBox::about(this, tr("Help"), tr("Ask for Help online.<br><br>"
+ "Please visit Clash forum at:<br>"
+ "<a href='https://sourceforge.net/forum/forum.php?forum_id=917628'>http://p.sf.net/geesas/Clash</a>."));
}
@@ -804,15 +799,17 @@
return true;
}
-bool Editor::saveObject(QString filePath)
-{
+bool Editor::saveObject(QString filePath) {
QFileInfo fileInfo(filePath);
if(fileInfo.isDir()) return false;
+
+ QDir::temp().mkdir("clash");
+ QString tempPath = QDir::temp().absolutePath()+"/clash/";
- QFileInfo dataInfo(filePath+".data");
+ QFileInfo dataInfo(tempPath+"content.data");
if(!dataInfo.exists()) {
- QDir dir(fileInfo.absolutePath()); // the directory where filePath is or will be saved
- dir.mkpath(filePath+".data"); // creates a directory with the same name +".data"
+ QDir dir(tempPath); // the directory where filePath is or will be saved
+ dir.mkpath(tempPath+"content.data"); // creates a directory with the same name +".data"
}
savedName=filePath;
@@ -826,26 +823,26 @@
// save data
int nLayers = object->getLayerCount();
for(int i=0; i < nLayers; i++) {
- qDebug() << "Saving Layer " << i;
+ //qDebug() << "Saving Layer " << i;
progressValue = (i*100)/nLayers;
progress.setValue(progressValue);
Layer* layer = object->getLayer(i);
- if(layer->type == Layer::BITMAP) ((LayerBitmap*)layer)->saveImages(filePath+".data", i);
- if(layer->type == Layer::VECTOR) ((LayerVector*)layer)->saveImages(filePath+".data", i);
- if(layer->type == Layer::SOUND) ((LayerSound*)layer)->saveImages(filePath+".data", i);
+ if(layer->type == Layer::BITMAP) ((LayerBitmap*)layer)->saveImages(tempPath+"content.data", i);
+ if(layer->type == Layer::VECTOR) ((LayerVector*)layer)->saveImages(tempPath+"content.data", i);
+ if(layer->type == Layer::SOUND) ((LayerSound*)layer)->saveImages(tempPath+"content.data", i);
}
// save palette
- object->savePalette(filePath+".data");
+ object->savePalette(tempPath+"content.data");
// -------- save main XML file -----------
- QFile* file = new QFile(filePath);
+ QFile* file = new QFile(tempPath+"content");
if (!file->open(QFile::WriteOnly | QFile::Text)) {
//QMessageBox::warning(this, "Warning", "Cannot write file");
return false;
}
QTextStream out(file);
- QDomDocument doc("PencilDocument");
+ QDomDocument doc("Clash");
QDomElement root = doc.createElement("document");
doc.appendChild(root);
@@ -858,7 +855,9 @@
int IndentSize = 2;
doc.save(out, IndentSize);
+ file->close();
// -----------------------------------
+ createC7Z(filePath);
progress.setValue(100);
@@ -878,7 +877,7 @@
maxFrame=0;
currentFrame=0;
scrubTo(0);
- mainWindow->setWindowTitle(tr("Pencil Animation v0.4.5b-rev5"));
+ mainWindow->setWindowTitle(tr("Clash v0.4.5b-rev6"));
}
void Editor::setObject(Object *object) {
@@ -920,12 +919,15 @@
// ---- test before opening ----
QFileInfo fileInfo(filePath);
if( fileInfo.isDir() ) return false;
- QFile* file = new QFile(filePath);
+ if (!openC7Z(filePath)) return false;
+ QString workingPath = QDir::temp().absolutePath()+"/clash/content";
+
+ QFile* file = new QFile(workingPath);
if (!file->open(QFile::ReadOnly)) return false;
QDomDocument doc;
if (!doc.setContent(file)) return false; // this is not a XML file
QDomDocumentType type = doc.doctype();
- if(type.name() != "PencilDocument" && type.name() != "MyObject") return false; // this is not a Pencil document
+ if(type.name() != "Clash" && type.name() != "PencilDocument" && type.name() != "MyObject") return false; // not a Clash document
// -----------------------------
QProgressDialog progress("Opening document...", "Abort", 0, 100, mainWindow);
@@ -933,12 +935,12 @@
progress.show();
savedName = filePath;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("lastFilePath", QVariant(savedName) );
mainWindow->setWindowTitle(savedName);
-
+
Object* newObject = new Object();
- if(!newObject->loadPalette(savedName+".data")) newObject->loadDefaultPalette();
+ if(!newObject->loadPalette(workingPath+".data")) newObject->loadDefaultPalette();
setObject(newObject);
// ------- reads the XML file -------
@@ -951,22 +953,33 @@
QDomElement element = tag.toElement(); // try to convert the node to an element.
if(!element.isNull()) {
if(element.tagName() == "editor") {
- loadDomElement(element, filePath);
+ loadDomElement(element, workingPath);
}
if(element.tagName() == "object") {
- ok = newObject->loadDomElement(element, filePath);
- qDebug() << "filePath:" << filePath;
+ ok = newObject->loadDomElement(element, workingPath);
}
}
tag = tag.nextSibling();
}
- } else {
- if(docElem.tagName() == "object" || docElem.tagName() == "MyOject") { // old Pencil format (<=0.4.3)
- ok = newObject->loadDomElement(docElem, filePath);
- }
+ } else if(docElem.tagName() == "object" || docElem.tagName() == "MyOject") { // old Pencil format (<=0.4.3)
+ ok = newObject->loadDomElement(docElem, workingPath);
}
// ------------------------------
if(ok) updateObject();
+ file->close();
+
+ // --------- Clean up working directory ---------
+ QDir dir(workingPath+".data");
+ QStringList filtername2("*");
+ QStringList entries2 = dir.entryList(filtername2,QDir::Files,QDir::Type);
+ for(int i=0;i<entries2.size();i++)
+ dir.remove(entries2[i]);
+ dir.remove(workingPath+".data");
+ dir.cdUp();
+ QStringList filtername("*");
+ QStringList entries = dir.entryList(filtername,QDir::Files,QDir::Type);
+ for(int i=0;i<entries.size();i++)
+ dir.remove(entries[i]);
progress.setValue(100);
return ok;
@@ -1114,7 +1127,7 @@
exportFlashDialog = new QDialog(this, Qt::Dialog);
QGridLayout *mainLayout = new QGridLayout;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
exportFlashDialog_compression = new QSlider(Qt::Horizontal);
@@ -1161,7 +1174,7 @@
}
bool Editor::exportSeq() {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString initialPath = settings.value("lastExportPath", QVariant(QDir::homePath())).toString();
if(initialPath.isEmpty()) initialPath = QDir::homePath() + "/untitled";
QString filePath = QFileDialog::getSaveFileName(this, tr("Export As"),initialPath);
@@ -1189,7 +1202,7 @@
}
bool Editor::exportX() {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString initialPath = settings.value("lastExportPath", QVariant(QDir::homePath())).toString();
if(initialPath.isEmpty()) initialPath = QDir::homePath() + "/untitled";
QString filePath = QFileDialog::getSaveFileName(this, tr("Save As"),initialPath);
@@ -1211,7 +1224,7 @@
bool Editor::exportMov() {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString initialPath = settings.value("lastExportPath", QVariant(QDir::homePath())).toString();
if(initialPath.isEmpty()) initialPath = QDir::homePath() + "/untitled";
QString filePath = QFileDialog::getSaveFileName(this, tr("Export As"),initialPath);
@@ -1236,7 +1249,7 @@
}
bool Editor::exportFlash() {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString initialPath = settings.value("lastExportPath", QVariant(QDir::homePath())).toString();
if(initialPath.isEmpty()) initialPath = QDir::homePath() + "/untitled";
QString filePath = QFileDialog::getSaveFileName(this, tr("Export SWF As"),initialPath);
@@ -1262,7 +1275,7 @@
void Editor::exportPalette()
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString initialPath = settings.value("lastFilePath", QVariant(QDir::homePath())).toString();
if(initialPath.isEmpty()) initialPath = QDir::homePath() + "/untitled.xml";
QString filePath = QFileDialog::getSaveFileName(this, tr("Export As"),initialPath);
@@ -1271,7 +1284,7 @@
void Editor::importPalette()
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString initialPath = settings.value("lastFilePath", QVariant(QDir::homePath())).toString();
if(initialPath.isEmpty()) initialPath = QDir::homePath() + "/untitled.xml";
QString filePath = QFileDialog::getOpenFileName(this, tr("Import"),initialPath);
@@ -1292,7 +1305,7 @@
if(layer != NULL) {
if( layer->type == Layer::BITMAP || layer->type == Layer::VECTOR ) {
if(filePath == "fromDialog") {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString initialPath = settings.value("lastImportPath", QVariant(QDir::homePath())).toString();
if(initialPath.isEmpty()) initialPath = QDir::homePath() + "/untitled";
filePath = QFileDialog::getOpenFileName(this, tr("Import image..."),initialPath);
@@ -1368,7 +1381,7 @@
if(layer != NULL) {
if( layer->type == Layer::SOUND) {
if(filePath == "fromDialog") {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QString initialPath = settings.value("lastImportPath", QVariant(QDir::homePath())).toString();
if(initialPath.isEmpty()) initialPath = QDir::homePath() + "/untitled";
filePath = QFileDialog::getOpenFileName(this, tr("Import sound..."),initialPath);
@@ -1572,7 +1585,7 @@
void Editor::changeFps(int x) {
fps=x;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("fps", x);
timer->setInterval(1000/fps);
}
@@ -1640,7 +1653,7 @@
}*/
void Editor::restorePalettesSettings(bool restoreFloating, bool restorePosition, bool restoreSize) {
- QSettings settings("Pencil", "Pencil");
+ QSettings settings("Clash", "Clash");
Palette* colourPalette = getPalette();
if(colourPalette != NULL) {
Modified: pencilanimation/src/interface/editor.h
===================================================================
--- pencilanimation/src/interface/editor.h 2009-02-14 20:35:24 UTC (rev 29)
+++ pencilanimation/src/interface/editor.h 2009-02-14 20:36:51 UTC (rev 30)
@@ -97,7 +97,9 @@
bool isModified() { return modified; }
int allLayers() { return scribbleArea->allLayers(); }
static QMatrix map(QRectF, QRectF);
-
+ bool createC7Z(QString filePath);
+ bool openC7Z(QString filePath);
+
protected:
void dragEnterEvent(QDragEnterEvent *event);
void dropEvent(QDropEvent *event);
@@ -112,7 +114,7 @@
void select_clicked();
void hand_clicked();
void eyedropper_clicked();
-
+
void clear_clicked();
void eraser_clicked();
void pen_clicked();
@@ -120,7 +122,7 @@
void bucket_clicked();
void color_clicked();
void smudge_clicked();
-
+
void showCounter(int);
bool maybeSave();
void importImage();
@@ -288,7 +290,7 @@
QComboBox *exportFramesDialog_format;
QComboBox *exportMovieDialog_format;
QSlider* exportFlashDialog_compression;
-
+
// saving (XML)
QDomElement createDomElement(QDomDocument &doc);
bool loadDomElement(QDomElement element, QString filePath);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 20:35:27
|
Revision: 29
http://geesas.svn.sourceforge.net/geesas/?rev=29&view=rev
Author: creek23
Date: 2009-02-14 20:35:24 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Modified Paths:
--------------
pencilanimation/src/structure/object.cpp
Modified: pencilanimation/src/structure/object.cpp
===================================================================
--- pencilanimation/src/structure/object.cpp 2009-02-14 20:33:42 UTC (rev 28)
+++ pencilanimation/src/structure/object.cpp 2009-02-14 20:35:24 UTC (rev 29)
@@ -131,7 +131,7 @@
}
QTextStream out(file);
- QDomDocument doc("PencilDocument");
+ QDomDocument doc("Clash");
QDomElement root = createDomElement(doc);
doc.appendChild(root);
@@ -268,10 +268,8 @@
}
bool Object::exportPalette(QString filePath) {
- //qDebug() << "coucou" << filePath;
QFile* file = new QFile(filePath);
if (!file->open(QFile::WriteOnly | QFile::Text)) {
- //QMessageBox::warning(this, "Warning", "Cannot write file");
return false;
}
QTextStream out(file);
@@ -293,6 +291,7 @@
int IndentSize = 2;
doc.save(out, IndentSize);
+ file->close();
return true;
}
@@ -325,6 +324,7 @@
}
tag = tag.nextSibling();
}
+ file->close();
return true;
}
@@ -413,7 +413,7 @@
void Object::exportFrames(int frameStart, int frameEnd, QMatrix view, Layer* currentLayer, QSize exportSize, QString filePath, const char* format, int quality, bool background, bool antialiasing, int gradients) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
qreal curveOpacity = (100-settings.value("curveOpacity").toInt())/100.0; // default value is 1.0
QString extension = "";
@@ -453,7 +453,7 @@
}
void Object::exportX(int frameStart, int frameEnd, QMatrix view, QSize exportSize, QString filePath, bool antialiasing, int gradients) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
qreal curveOpacity = (100-settings.value("curveOpacity").toInt())/100.0; // default value is 1.0
int page;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 20:33:45
|
Revision: 28
http://geesas.svn.sourceforge.net/geesas/?rev=28&view=rev
Author: creek23
Date: 2009-02-14 20:33:42 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
commented out qDebugs when saving.
Modified Paths:
--------------
pencilanimation/src/structure/layerimage.cpp
Modified: pencilanimation/src/structure/layerimage.cpp
===================================================================
--- pencilanimation/src/structure/layerimage.cpp 2009-02-14 20:32:55 UTC (rev 27)
+++ pencilanimation/src/structure/layerimage.cpp 2009-02-14 20:33:42 UTC (rev 28)
@@ -288,10 +288,10 @@
// --- we test if all the files already exists
for(int i=0; i < framesPosition.size(); i++) {
QString fileName = framesFilename.at(i);
- qDebug() << "Testing if (" << i << ") " << fileName << " exists";
+ //qDebug() << "Testing if (" << i << ") " << fileName << " exists";
bool test = dir.exists(fileName);
if(!test) {
- qDebug() << "--- The file does not seem to exist.";
+ //qDebug() << "--- The file does not seem to exist.";
framesModified[i] = true;
}
}
@@ -329,7 +329,7 @@
// --- we now save the files for the images which have been modified
for(int i=0; i < framesPosition.size(); i++) {
if(framesModified.at(i)) {
- qDebug() << "Trying to save " << framesFilename.at(i);
+ //qDebug() << "Trying to save " << framesFilename.at(i);
saveImage(i, path, layerNumber);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 20:33:02
|
Revision: 27
http://geesas.svn.sourceforge.net/geesas/?rev=27&view=rev
Author: creek23
Date: 2009-02-14 20:32:55 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
added the creation/opening of C7Z file for Clash.
Modified Paths:
--------------
pencilanimation/src/external/win32/win32.cpp
Modified: pencilanimation/src/external/win32/win32.cpp
===================================================================
--- pencilanimation/src/external/win32/win32.cpp 2009-02-14 15:37:46 UTC (rev 26)
+++ pencilanimation/src/external/win32/win32.cpp 2009-02-14 20:32:55 UTC (rev 27)
@@ -76,3 +76,86 @@
}
qDebug() << "-----";
}
+
+bool Editor::createC7Z(QString filePath) {
+ if(!filePath.endsWith(".c7z", Qt::CaseInsensitive)) {
+ filePath = filePath + ".c7z";
+ }
+ bool result = false;
+ QString tempPath = QDir::temp().absolutePath()+"/clash/";
+ QDir dir2(filePath);
+ if (QFile::exists(QDir::current().currentPath() +"/plugins/7z.exe") == true) {
+ if (QFile::exists(filePath) == true) { dir2.remove(filePath); }
+
+ QProcess c7z;
+ c7z.start("./plugins/7z a \"" + filePath + "\" -y -w " + tempPath + "*");
+ if (c7z.waitForStarted() == true) {
+ //wait for the program to finish for 5 mins. if it didnt, force quit.
+ if (c7z.waitForFinished(300000) == true) {
+ qDebug() << "C7Z saved.";
+ result = true;
+ } else {
+ qDebug() << "ERROR: 7z did not finish executing.";
+ }
+ } else {
+ qDebug() << "ERROR: Could not execute 7z.";
+ }
+ // --------- Clean up temp directory ---------
+ QDir dir__(tempPath+"content.data");
+ QStringList filtername2("*.*");
+ QStringList entries2 = dir__.entryList(filtername2,QDir::Files,QDir::Type);
+ for(int i=0;i<entries2.size();i++)
+ dir__.remove(entries2[i]);
+ QDir dir(tempPath);
+ QStringList filtername("*");
+ QStringList entries = dir.entryList(filtername,QDir::Files,QDir::Type);
+ for(int i=0;i<entries.size();i++)
+ dir.remove(entries[i]);
+ } else {
+ qDebug() << "Please place 7z.exe in plugins directory";
+ }
+ qDebug() << "-----";
+ return result;
+}
+
+bool Editor::openC7Z(QString filePath) {
+ if(!filePath.endsWith(".c7z", Qt::CaseInsensitive)) {
+ filePath = filePath + ".c7z";
+ }
+ bool result = false;
+ QString tempPath = QDir::temp().absolutePath()+"/clash/";
+ QDir dir2(filePath);
+ if (QFile::exists(QDir::current().currentPath() +"/plugins/7z.exe") == true) {
+ // --------- Clean up working directory ---------
+ QDir dir__(tempPath+"content.data");
+ QStringList filtername2("*.*");
+ QStringList entries2 = dir__.entryList(filtername2,QDir::Files,QDir::Type);
+ for(int i=0;i<entries2.size();i++)
+ dir__.remove(entries2[i]);
+ QDir dir(tempPath);
+ QStringList filtername("*");
+ QStringList entries = dir.entryList(filtername,QDir::Files,QDir::Type);
+ for(int i=0;i<entries.size();i++)
+ dir.remove(entries[i]);
+ //if (QFile::exists(filePath) == true) { dir2.remove(filePath); }
+
+ QProcess c7z;
+ c7z.start("./plugins/7z x \"" + filePath + "\" -y -o" + tempPath);
+ if (c7z.waitForStarted() == true) {
+ //wait for the program to finish for 5 mins. if it didnt, force quit.
+ if (c7z.waitForFinished(300000) == true) {
+ qDebug() << "Opened C7Z.";
+ result = true;
+ } else {
+ qDebug() << "ERROR: 7z did not finish executing.";
+ }
+ } else {
+ qDebug() << "ERROR: Could not execute 7z.";
+ }
+
+ } else {
+ qDebug() << "Please place 7z.exe in plugins directory";
+ }
+ qDebug() << "-----";
+ return result;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 15:37:48
|
Revision: 26
http://geesas.svn.sourceforge.net/geesas/?rev=26&view=rev
Author: creek23
Date: 2009-02-14 15:37:46 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
removed qDebug statement -- moved to Editor::Editor.
Modified Paths:
--------------
pencilanimation/src/main.cpp
Modified: pencilanimation/src/main.cpp
===================================================================
--- pencilanimation/src/main.cpp 2009-02-14 15:31:06 UTC (rev 25)
+++ pencilanimation/src/main.cpp 2009-02-14 15:37:46 UTC (rev 26)
@@ -21,7 +21,6 @@
int main(int argc, char *argv[])
{
- qDebug() << "Pencil Animation 0.4.5b-rev5";
QApplication app(argc, argv);
#ifndef Q_WS_MAC
app.setWindowIcon(QIcon(":/icons/icon.png"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 15:31:08
|
Revision: 25
http://geesas.svn.sourceforge.net/geesas/?rev=25&view=rev
Author: creek23
Date: 2009-02-14 15:31:06 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Modified Paths:
--------------
pencilanimation/src/interface/toolset.cpp
Modified: pencilanimation/src/interface/toolset.cpp
===================================================================
--- pencilanimation/src/interface/toolset.cpp 2009-02-14 15:29:37 UTC (rev 24)
+++ pencilanimation/src/interface/toolset.cpp 2009-02-14 15:31:06 UTC (rev 25)
@@ -150,7 +150,7 @@
QGridLayout *timeLay = new QGridLayout();
//QVBoxLayout *butlay = new QVBoxLayout();
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
newToolButton(pencilButton);
newToolButton(selectButton);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 15:29:40
|
Revision: 24
http://geesas.svn.sourceforge.net/geesas/?rev=24&view=rev
Author: creek23
Date: 2009-02-14 15:29:37 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Modified Paths:
--------------
pencilanimation/src/interface/preferences.cpp
Modified: pencilanimation/src/interface/preferences.cpp
===================================================================
--- pencilanimation/src/interface/preferences.cpp 2009-02-14 15:27:14 UTC (rev 23)
+++ pencilanimation/src/interface/preferences.cpp 2009-02-14 15:29:37 UTC (rev 24)
@@ -99,7 +99,7 @@
GeneralPage::GeneralPage(QWidget *parent) : QWidget(parent) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QVBoxLayout *lay = new QVBoxLayout();
QGroupBox* windowOpacityBox = new QGroupBox(tr("Window opacity"));
@@ -309,7 +309,7 @@
TimelinePage::TimelinePage(QWidget *parent) : QWidget(parent) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QVBoxLayout *lay = new QVBoxLayout();
@@ -368,7 +368,7 @@
}
FilesPage::FilesPage(QWidget *parent) : QWidget(parent) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
QVBoxLayout *lay = new QVBoxLayout();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 15:27:16
|
Revision: 23
http://geesas.svn.sourceforge.net/geesas/?rev=23&view=rev
Author: creek23
Date: 2009-02-14 15:27:14 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Few cleanup.
Modified Paths:
--------------
pencilanimation/src/interface/scribblearea.cpp
Modified: pencilanimation/src/interface/scribblearea.cpp
===================================================================
--- pencilanimation/src/interface/scribblearea.cpp 2009-02-14 15:21:56 UTC (rev 22)
+++ pencilanimation/src/interface/scribblearea.cpp 2009-02-14 15:27:14 UTC (rev 23)
@@ -58,7 +58,7 @@
// : QGLWidget(QGLFormat(QGL::SampleBuffers), parent)
{
this->editor = editor;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
pencil.width = settings.value("pencilWidth").toDouble();
if (pencil.width == 0) { pencil.width = 1; settings.setValue("pencilWidth", pencil.width); }
@@ -200,13 +200,13 @@
void ScribbleArea::setColour(const QColor colour)
{
- if(toolMode == PENCIL) {// || toolMode == EYEDROPPER) {
+ if(toolMode == PENCIL) {
pencil.colour = colour;
}
- if(toolMode == PEN || toolMode == POLYLINE) {// || toolMode == EYEDROPPER) {
+ if(toolMode == PEN || toolMode == POLYLINE) {
pen.colour = colour;
}
- if(toolMode == COLOURING || toolMode == BUCKET) {// || toolMode == EYEDROPPER) {
+ if(toolMode == COLOURING || toolMode == BUCKET) {
brush.colour = colour;
}
if (toolMode == EYEDROPPER) {
@@ -227,7 +227,7 @@
void ScribbleArea::setWidth(const qreal newWidth)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if(toolMode == PENCIL) {
pencil.width = newWidth;
settings.setValue("pencilWidth", newWidth);
@@ -251,7 +251,7 @@
void ScribbleArea::setFeather(const qreal newFeather)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if(toolMode == PENCIL) {
pencil.feather = newFeather;
settings.setValue("pencilOpacity", newFeather);
@@ -271,7 +271,7 @@
void ScribbleArea::setOpacity(const qreal newOpacity)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if(toolMode == PENCIL) {
pencil.opacity = newOpacity;
settings.setValue("pencilOpacity", newOpacity);
@@ -290,7 +290,7 @@
void ScribbleArea::setInvisibility(const bool invisibility)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if(toolMode == PENCIL) {
pencil.invisibility = invisibility;
settings.setValue("pencilOpacity", invisibility);
@@ -305,7 +305,7 @@
void ScribbleArea::setPressure(const bool pressure)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if(toolMode == PENCIL) {
pencil.pressure = pressure;
settings.setValue("pencilOpacity", pressure);
@@ -324,7 +324,7 @@
void ScribbleArea::setPreserveAlpha(const bool preserveAlpha)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if(toolMode == PENCIL) {
pencil.preserveAlpha = preserveAlpha;
//settings.setValue("pencilCompositionMode", preserveAlpha);
@@ -349,7 +349,7 @@
void ScribbleArea::setCurveOpacity(int newOpacity)
{
curveOpacity = newOpacity/100.0;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("curveOpacity", 100-newOpacity);
updateAllVectorLayers();
}
@@ -357,20 +357,20 @@
void ScribbleArea::setCurveSmoothing(int newSmoothingLevel)
{
curveSmoothing = newSmoothingLevel/20.0;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("curveSmoothing", newSmoothingLevel);
}
void ScribbleArea::setHighResPosition(int x)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if (x==0) { highResPosition=false; settings.setValue("highResPosition","false"); }
else { highResPosition=true; settings.setValue("highResPosition","true"); }
}
void ScribbleArea::setAntialiasing(int x)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if (x==0) { antialiasing=false; settings.setValue("antialiasing","false"); }
else { antialiasing=true; settings.setValue("antialiasing","true"); }
updateAllVectorLayers();
@@ -379,7 +379,7 @@
void ScribbleArea::setGradients(int x)
{
//if(x==0) { gradients = x; } else { gradients = x; }
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if(x > 0) {
gradients = x;
settings.setValue("gradients", gradients);
@@ -394,7 +394,7 @@
void ScribbleArea::setShadows(int x)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if (x==0) { shadows=false; settings.setValue("shadows","false"); }
else { shadows=true; settings.setValue("shadows","true"); }
update();
@@ -402,14 +402,14 @@
void ScribbleArea::setToolCursors(int x)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if (x==0) { toolCursors=false; settings.setValue("toolCursors","false"); }
else { toolCursors=true; settings.setValue("toolCursors","true"); }
}
void ScribbleArea::setStyle(int x)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if (x==0) { settings.setValue("style","default"); }
else { settings.setValue("style","aqua"); }
update();
@@ -427,7 +427,7 @@
void ScribbleArea::setBackgroundBrush(QString brushName)
{
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("background", brushName);
backgroundBrush = getBackgroundBrush(brushName);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 15:22:01
|
Revision: 22
http://geesas.svn.sourceforge.net/geesas/?rev=22&view=rev
Author: creek23
Date: 2009-02-14 15:21:56 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Few clean up.
Modified Paths:
--------------
pencilanimation/src/interface/timeline.cpp
Modified: pencilanimation/src/interface/timeline.cpp
===================================================================
--- pencilanimation/src/interface/timeline.cpp 2009-02-14 15:19:19 UTC (rev 21)
+++ pencilanimation/src/interface/timeline.cpp 2009-02-14 15:21:56 UTC (rev 22)
@@ -233,13 +233,6 @@
connect(removeLayerButton, SIGNAL(clicked()), this, SIGNAL(deleteCurrentLayer()));
scrubbing = false;
- //QSettings settings("Pencil","Pencil");
- //layerHeight = (settings.value("layerHeight").toInt());
- //if(layerHeight==0) { layerHeight=20; settings.setValue("layerHeight", layerHeight); }
- //startY = 0;
- //endY = 0;
- //startLayerNumber = -1;
- //offsetY = 15;
}
@@ -356,7 +349,7 @@
this->type = type;
cache = NULL;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
frameLength = settings.value("length").toInt();
if (frameLength==0) { frameLength=240; settings.setValue("length", frameLength); }
@@ -666,7 +659,7 @@
void TimeLineCells::fontSizeChange(int x) {
fontSize=x;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("labelFontSize", x);
updateContent();
}
@@ -675,7 +668,7 @@
//int old;
//old=frameSize;
frameSize = x;
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("frameSize", x);
/*int i;
for(i=0;i<frame.size();i++) {
@@ -686,14 +679,14 @@
}
void TimeLineCells::scrubChange(int x) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if (x==0) { shortScrub=false; settings.setValue("shortScrub","false"); }
else { shortScrub=true; settings.setValue("shortScrub","true"); }
update();
}
void TimeLineCells::labelChange(int x) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
if (x==0) { drawFrameNumber=false; settings.setValue("drawLabel","false"); }
else { drawFrameNumber=true; settings.setValue("drawLabel","true"); }
updateContent();
@@ -707,7 +700,7 @@
//setMinimumSize(dec*frameSize,40);
//setFixedWidth(dec*frameSize);
updateContent();
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("length", dec);
}
@@ -717,7 +710,7 @@
updateLength(dec);
updateContent();
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("length", dec);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cr...@us...> - 2009-02-14 15:19:21
|
Revision: 21
http://geesas.svn.sourceforge.net/geesas/?rev=21&view=rev
Author: creek23
Date: 2009-02-14 15:19:19 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
Pencil to Clash rebranding.
Modified Paths:
--------------
pencilanimation/src/interface/mainwindow.cpp
Modified: pencilanimation/src/interface/mainwindow.cpp
===================================================================
--- pencilanimation/src/interface/mainwindow.cpp 2009-02-13 21:59:16 UTC (rev 20)
+++ pencilanimation/src/interface/mainwindow.cpp 2009-02-14 15:19:19 UTC (rev 21)
@@ -424,7 +424,7 @@
}
void MainWindow::setOpacity(int opacity) {
- QSettings settings("Pencil","Pencil");
+ QSettings settings("Clash","Clash");
settings.setValue("windowOpacity", 100-opacity);
setWindowOpacity(opacity/100.0);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: SourceForge.net <no...@so...> - 2009-02-14 14:31:49
|
Read and respond to this message at: https://sourceforge.net/forum/message.php?msg_id=6425005 By: creek23 Starting this day, Pencil Animation will now be called Clash. ______________________________________________________________________ You are receiving this email because you elected to monitor this forum. To stop monitoring this forum, login to SourceForge.net and visit: https://sourceforge.net/forum/unmonitor.php?forum_id=917628 |
|
From: <cr...@us...> - 2009-02-13 22:57:14
|
Revision: 20
http://geesas.svn.sourceforge.net/geesas/?rev=20&view=rev
Author: creek23
Date: 2009-02-13 21:59:16 +0000 (Fri, 13 Feb 2009)
Log Message:
-----------
cleaned up some comments
Modified Paths:
--------------
pencilanimation/src/main.cpp
Modified: pencilanimation/src/main.cpp
===================================================================
--- pencilanimation/src/main.cpp 2009-02-11 14:26:27 UTC (rev 19)
+++ pencilanimation/src/main.cpp 2009-02-13 21:59:16 UTC (rev 20)
@@ -27,11 +27,6 @@
app.setWindowIcon(QIcon(":/icons/icon.png"));
#endif
initialise();
- /*QDir dir(QApplication::applicationDirPath());
- dir.cdUp();
- if(dir.cd("plugins")) {
- QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
- }*/
MainWindow mainWindow;
mainWindow.show();
//qDebug() << "MainWindow thread" << mainWindow.thread();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
