Skip to content

Commit

Permalink
updated files for release0.3.0
Browse files Browse the repository at this point in the history
updated the about box to include the full GPL statement, previously
  missing and added the statement to the Oxygen icons, and removed
  the temporary message and command line usage message
updated the CommandLine class because it did not include the full GPL
  statement, just the copyright and warranty statements (which were
  left intact so as not to break the reqression tests)
updated the LICENSE file to include info about the Oxygen icons
updated the README file for the latest changes
  • Loading branch information
thunder422 committed Jan 1, 2013
1 parent a2d2675 commit 4f0378e
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 30 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -48,7 +48,7 @@ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
set(ibcp_COPYRIGHT_YEAR 2012)

set(ibcp_RELEASE_MAJOR 0)
set(ibcp_RELEASE_MINOR 2)
set(ibcp_RELEASE_MINOR 3)
set(ibcp_RELEASE_PATCH 0)

set(ibcp_RELEASE_STRING release${ibcp_RELEASE_MAJOR}.${ibcp_RELEASE_MINOR})
Expand Down
5 changes: 4 additions & 1 deletion LICENSE
Expand Up @@ -11,4 +11,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

For a copy of the GNU General Public License,
see <http://www.gnu.org/licenses/>.
see <http://www.gnu.org/licenses>.

The Oxygen icons (see <http::/www.oxygen-icons.org>) are used
under LGPLv3, see <http://www.gnu.org/copyleft/lesser.html>.
9 changes: 6 additions & 3 deletions README
Expand Up @@ -33,8 +33,11 @@ converts text input into BASIC language tokens. The translator is
currently being developed and currently supports the translation of
BASIC expressions along a few BASIC commands (LET, PRINT, and INPUT)
into a reverse polish notation format that will be used for fast
execution of the BASIC program. The GUI implementation has been
started but currently only displays an about box.
execution of the BASIC program. The GUI implementation has been started
and now has the basic GUI elements including file and help menus with
basic file operation menu items, the tool bar with several file
operations, an edit box for editing the program and a status bar. For
now the program only handles text files.


Building The Program
Expand Down Expand Up @@ -66,7 +69,7 @@ Command Line Options
--------------------
The -v option will output the version string and exit. The -h or -?
option will output the usage message and exit. No options will start
the GUI, which currently only displays the about box and then exits.
the GUI.


Running Interactively
Expand Down
9 changes: 6 additions & 3 deletions commandline.cpp
Expand Up @@ -29,9 +29,12 @@
#include "test_ibcp.h"


// create GPL statement string list
const char *CommandLine::s_gplStatement[] = {
QT_TR_NOOP("%1 Copyright (C) 2010-%2 Thunder422"),
// create copyright statement string
const char *CommandLine::s_copyrightStatement =
QT_TR_NOOP("%1 Copyright (C) 2010-%2 Thunder422");

// create warranty statement string list
const char *CommandLine::s_warrantyStatement[] = {
QT_TR_NOOP("This program comes with ABSOLUTELY NO WARRANTY."),
QT_TR_NOOP("This is free software, and you are welcome to"),
QT_TR_NOOP("redistribute it under certain conditions."),
Expand Down
11 changes: 8 additions & 3 deletions commandline.h
Expand Up @@ -38,7 +38,8 @@ class CommandLine
bool isVersionOption(const QStringList &args);
bool isHelpOption(const QStringList &args) const;

static const char *s_gplStatement[];
static const char *s_copyrightStatement;
static const char *s_warrantyStatement[];

QString m_programName;
int m_returnCode;
Expand Down Expand Up @@ -66,9 +67,13 @@ class CommandLine
}
QString version(void) const;
int copyrightYear(void) const;
static const char **gplStatement(void)
static const char *copyrightStatement(void)
{
return s_gplStatement;
return s_copyrightStatement;
}
static const char **warrantyStatement(void)
{
return s_warrantyStatement;
}
};

Expand Down
35 changes: 24 additions & 11 deletions mainwindow.cpp
Expand Up @@ -159,17 +159,30 @@ void MainWindow::on_actionAbout_triggered(void)
// build up about box string
QString aboutString(tr("<h3>Interactive BASIC Compiler Project</h3>"));

const char **gpl = m_commandLine->gplStatement();
// add version and copyright year to first string
aboutString.append(tr(gpl[0]).arg(tr("Version %1")
.arg(m_commandLine->version())).arg(m_commandLine->copyrightYear())
.append("<br>"));
for (int i = 1; gpl[i]; i++)
{
aboutString.append("<br>").append(tr(gpl[i]));
}
aboutString.append(tr("<p><i>Temporary GUI Placeholder</i>"));
aboutString.append(tr("<p>Command line %1").arg(m_commandLine->usage()));
const char *copyright = m_commandLine->copyrightStatement();
// add version and copyright year to string
aboutString.append(tr(copyright).arg(tr("Version %1")
.arg(m_commandLine->version())).arg(m_commandLine->copyrightYear()));

// add license statements
aboutString.append(tr("<p>This program is free software: you can "
"redistribute it and/or modify it under the terms of the GNU General "
"Public License as published by the Free Software Foundation, either "
"version 3 of the License, or (at your option) any later version."));
aboutString.append(tr("<p>This program is distributed in the hope that it "
"will be useful, but WITHOUT ANY WARRANTY; without even the implied "
"warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "
"See the GNU General Public License for more details."));
aboutString.append(tr("<p>For a copy of the GNU General Public License, "
"<br>see <a href=\"http://www.gnu.org/licenses\" target=\"_blank\">"
"http://www.gnu.org/licenses</a>."));

// add oxygen icon license statement
aboutString.append(tr("<p>The Oxygen icons (see "
"<a href=\"http://www.oxygen-icons.org\" target=\"_blank\">"
"http://www.oxygen-icons.org</a>) are used<br>under LGPLv3, "
"see <a href=\"http://www.gnu.org/copyleft/lesser.html\" "
"target=\"_blank\">http://www.gnu.org/copyleft/lesser.html</a>."));

QMessageBox::about(this, tr("About IBCP"), aboutString);
}
Expand Down
10 changes: 10 additions & 0 deletions rel_notes.txt
Expand Up @@ -43,6 +43,16 @@ Planned Roadmap (needs to redone):
found in the git repository at https://github.com/thunder422/ibcp.


Release 0.3.0 (2013-01-13)

Project developmental release - basic GUI elements have been
implemented including file and help menus with basic file
operation menu items, the tool bar with several file operations,
an edit box for editing the program and a status bar. For now
the program only handles text files. A resources file has also
been added to support imbedded icons.


Release 0.2.0 (2012-12-09)

Project developmental release - the project was transitioned to using
Expand Down
17 changes: 9 additions & 8 deletions test_ibcp.cpp
Expand Up @@ -157,16 +157,17 @@ bool Tester::run(QTextStream &cout, CommandLine *commandLine)

cout << endl;

const char **gpl = commandLine->gplStatement();
for (int i = 0; gpl[i]; i++)
// don't use tr() here to get strings so output matches expected results
const char *copyright = commandLine->copyrightStatement();
QString line = QString(copyright).arg(commandLine->programName())
.arg(commandLine->copyrightYear());
cout << line << endl;

const char **warranty = commandLine->warrantyStatement();
for (int i = 0; warranty[i]; i++)
{
// don't use tr() here to get strings so output matches expected results
QString line = QString(gpl[i]);
if (i == 0)
{
line = line.arg(commandLine->programName())
.arg(commandLine->copyrightYear());
}
QString line = QString(warranty[i]);
cout << line << endl;
}

Expand Down

0 comments on commit 4f0378e

Please sign in to comment.