changeset
- removed the version monikers, new version is now just 0.3 instead of 0.3-alpha. BUILD_ID can now only be INTERNAL and RELEASE. It was way too complicated to my tastes.
Thu, 19 Dec 2013 01:18:34 +0200
- author
- Santeri Piippo <crimsondusk64@gmail.com>
- date
- Thu, 19 Dec 2013 01:18:34 +0200
- changeset 566
- 549c63863544
- parent 565
- e403aad83f60
- child 567
- 82101a296f9e
- removed the version monikers, new version is now just 0.3 instead of 0.3-alpha. BUILD_ID can now only be INTERNAL and RELEASE. It was way too complicated to my tastes.
| changelog.txt | file | annotate | diff | comparison | revisions | |
| src/document.cc | file | annotate | diff | comparison | revisions | |
| src/gui.cc | file | annotate | diff | comparison | revisions | |
| src/main.cc | file | annotate | diff | comparison | revisions | |
| src/main.h | file | annotate | diff | comparison | revisions |
--- a/changelog.txt Thu Dec 19 01:06:34 2013 +0200 +++ b/changelog.txt Thu Dec 19 01:18:34 2013 +0200 @@ -1,5 +1,5 @@ ================================================= -== Changes in version 0.3-alpha +== Changes in version 0.3 ================================================= - Multiple files can now be kept open at the same time. A new list widget is on the left to contain the list of currently open files. @@ -49,7 +49,7 @@ - Fixed: The message log was still written with black text with dark backgrounds. ================================================= -== Changes in version 0.2-alpha +== Changes in version 0.2 ================================================= - Completely rewrote history (undo/redo) code, making it a LOT stabler in the process.
--- a/src/document.cc Thu Dec 19 01:06:34 2013 +0200 +++ b/src/document.cc Thu Dec 19 01:18:34 2013 +0200 @@ -1226,7 +1226,7 @@ void LDDocument::swapObjects (LDObject* one, LDObject* other) { int a = m_Objects.indexOf (one); int b = m_Objects.indexOf (other); - assert (a != b != -1); + assert (a != b && a != -1 && b != -1); m_Objects[b] = one; m_Objects[a] = other; addToHistory (new SwapHistory (one->getID(), other->getID()));
--- a/src/gui.cc Thu Dec 19 01:06:34 2013 +0200 +++ b/src/gui.cc Thu Dec 19 01:18:34 2013 +0200 @@ -250,7 +250,7 @@ #ifdef DEBUG title += " [debug build]"; #elif BUILD_ID != BUILD_RELEASE - title += " [release build]"; + title += " [pre-release build]"; #endif // DEBUG setWindowTitle (title);
--- a/src/main.cc Thu Dec 19 01:06:34 2013 +0200 +++ b/src/main.cc Thu Dec 19 01:18:34 2013 +0200 @@ -117,23 +117,6 @@ // ============================================================================= // ----------------------------------------------------------------------------- -QString versionMoniker() -{ -#if BUILD_ID == BUILD_INTERNAL - return "Internal"; -#elif BUILD_ID == BUILD_ALPHA - return "Alpha"; -#elif BUILD_ID == BUILD_BETA - return "Beta"; -#elif BUILD_ID == BUILD_RC - return fmt ("RC %1", RC_NUMBER); -#else - return ""; -#endif // BUILD_ID -} - -// ============================================================================= -// ----------------------------------------------------------------------------- QString fullVersionString() -{ return fmt ("v%1 %2", versionString(), versionMoniker()); +{ return "v" + versionString(); } \ No newline at end of file
--- a/src/main.h Thu Dec 19 01:06:34 2013 +0200 +++ b/src/main.h Thu Dec 19 01:18:34 2013 +0200 @@ -58,13 +58,7 @@ #define BUILD_ID BUILD_INTERNAL #define BUILD_INTERNAL 0 -#define BUILD_ALPHA 1 -#define BUILD_BETA 2 -#define BUILD_RC 3 -#define BUILD_RELEASE 4 - -// RC Number for BUILD_RC -#define RC_NUMBER 0 +#define BUILD_RELEASE 1 // ============================================= #ifdef DEBUG @@ -126,7 +120,6 @@ // Version string identifier QString versionString(); -QString versionMoniker(); QString fullVersionString(); #define properties private
