From d5bdeba22efae1ba67abfab46e530849679601f3 Mon Sep 17 00:00:00 2001 From: Pete Goodeve Date: Mon, 27 Mar 2017 16:48:32 -0700 Subject: [PATCH] Updated version to 2.1.1 (with various adjustments) --- artpaint/ArtPaint.rdef | 4 ++-- artpaint/application/EnglishStrings.h | 4 ++-- artpaint/application/VersionConstants.h | 20 -------------------- artpaint/paintwindow/PaintWindow.cpp | 1 - artpaint/windows/AboutWindow.cpp | 4 +++- 5 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 artpaint/application/VersionConstants.h diff --git a/artpaint/ArtPaint.rdef b/artpaint/ArtPaint.rdef index 21c92d3c..1a8d04a0 100644 --- a/artpaint/ArtPaint.rdef +++ b/artpaint/ArtPaint.rdef @@ -9,7 +9,7 @@ resource app_flags B_SINGLE_LAUNCH; resource app_version { major = 2, middle = 1, - minor = 0, + minor = 1, /* 0 = development 1 = alpha 2 = beta 3 = gamma 4 = golden master 5 = final */ @@ -19,7 +19,7 @@ resource app_version { internal = 1, short_info = "ArtPaint", - long_info = "ArtPaint, Copyright 2003 - 2009" + long_info = "ArtPaint, Copyright 2003 - 2017" }; resource file_types message { diff --git a/artpaint/application/EnglishStrings.h b/artpaint/application/EnglishStrings.h index 997fc833..19d6cfe5 100644 --- a/artpaint/application/EnglishStrings.h +++ b/artpaint/application/EnglishStrings.h @@ -323,8 +323,8 @@ // These strings are the contents of the About ArtPaint-window -#define ENGLISH_ABOUT_1_TEXT_STRING "ArtPaint is a painting and image-processing program for the Haiku."\ - " It can be used for wide variety of purposes ranging from web-graphics"\ +#define ENGLISH_ABOUT_1_TEXT_STRING "ArtPaint is a painting and image-processing program for Haiku."\ + " It can be used for a wide variety of purposes ranging from web-graphics"\ " to photo manipulation. See the tutorial in the manual to get started." #define ENGLISH_ABOUT_3_TEXT_STRING "For new versions of the program see:" diff --git a/artpaint/application/VersionConstants.h b/artpaint/application/VersionConstants.h deleted file mode 100644 index 94875a53..00000000 --- a/artpaint/application/VersionConstants.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2003, Heikki Suhonen - * Distributed under the terms of the MIT License. - * - * Authors: - * Heikki Suhonen - * - */ -#ifndef VERSION_NUMBERS_H -#define VERSION_NUMBERS_H - - -// ArtPaint version number is 32 bits in the form 1.0.0.0 -// The first digit is major version, the second is release -// version. The third digit is a minor update. -// The last digit is not currently used. -#define ARTPAINT_VERSION 0x01020200 - - -#endif diff --git a/artpaint/paintwindow/PaintWindow.cpp b/artpaint/paintwindow/PaintWindow.cpp index 681fdeda..036a0a0c 100644 --- a/artpaint/paintwindow/PaintWindow.cpp +++ b/artpaint/paintwindow/PaintWindow.cpp @@ -39,7 +39,6 @@ #include "ToolSetupWindow.h" #include "ToolSelectionWindow.h" #include "UtilityClasses.h" -#include "VersionConstants.h" #include "ViewSetupWindow.h" diff --git a/artpaint/windows/AboutWindow.cpp b/artpaint/windows/AboutWindow.cpp index 1882be55..d14af5a1 100644 --- a/artpaint/windows/AboutWindow.cpp +++ b/artpaint/windows/AboutWindow.cpp @@ -43,7 +43,7 @@ AboutWindow::AboutWindow(BRect frame) BFont italic_font; italic_font.SetFace(B_ITALIC_FACE); - scroller->AddLine("ArtPaint v. 2.0",yellow,title_font); + scroller->AddLine("ArtPaint v. 2.1.1",yellow,title_font); char string[256]; sprintf(string, StringServer::ReturnString(RELEASE_DATE_STRING), __DATE__); @@ -53,11 +53,13 @@ AboutWindow::AboutWindow(BRect frame) scroller->AddLine(StringServer::ReturnString(ABOUT_1_TEXT_STRING),white,text_font); scroller->AddEmptyLine(); + /* These items have been commented out until they can be updated! scroller->AddLine(StringServer::ReturnString(ABOUT_3_TEXT_STRING),white,text_font); scroller->AddLine("http://dev.osdrawer.net/projects/list_files/artpaint",red,text_font); scroller->AddEmptyLine(); scroller->AddLine(StringServer::ReturnString(ABOUT_4_TEXT_STRING),white,text_font); scroller->AddLine("http://dev.osdrawer.net/projects/artpaint/boards",red,text_font); + */ scroller->AddEmptyLine(); scroller->AddEmptyLine(); scroller->AddEmptyLine();