Reconcile style accross all source files.
- All glabels code is in "glabels" top-level namespace. - Other assorted cleanup.
This commit is contained in:
+52
-47
@@ -28,56 +28,61 @@
|
||||
#include "Version.h"
|
||||
|
||||
|
||||
///
|
||||
/// Constructor
|
||||
///
|
||||
AboutDialog::AboutDialog( QWidget *parent )
|
||||
: QDialog(parent)
|
||||
namespace glabels
|
||||
{
|
||||
setupUi( this );
|
||||
|
||||
QString version = tr("Version") + " " + Version::STRING;
|
||||
|
||||
QString description = tr("A program to create labels and business cards.");
|
||||
|
||||
QString copyright = "Copyright © 2017 Jim Evins <evins@snaught.com>";
|
||||
|
||||
QString licenseParagraph1 =
|
||||
tr( "gLabels 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." );
|
||||
///
|
||||
/// Constructor
|
||||
///
|
||||
AboutDialog::AboutDialog( QWidget *parent )
|
||||
: QDialog(parent)
|
||||
{
|
||||
setupUi( this );
|
||||
|
||||
QString licenseParagraph2 =
|
||||
tr( "gLabels 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." );
|
||||
QString version = tr("Version") + " " + Version::STRING;
|
||||
|
||||
QString markup =
|
||||
"<p align='center'>" + version + "</p>" +
|
||||
"<p align='center'>" + description + "</p>" +
|
||||
"<p align='center'>" + copyright + "</p>" +
|
||||
"<p align='left'>" + licenseParagraph1 + "</p>" +
|
||||
"<p align='left'>" + licenseParagraph2 + "</p>";
|
||||
QString description = tr("A program to create labels and business cards.");
|
||||
|
||||
QString copyright = "Copyright © 2017 Jim Evins <evins@snaught.com>";
|
||||
|
||||
QString licenseParagraph1 =
|
||||
tr( "gLabels 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." );
|
||||
|
||||
QString licenseParagraph2 =
|
||||
tr( "gLabels 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." );
|
||||
|
||||
QString markup =
|
||||
"<p align='center'>" + version + "</p>" +
|
||||
"<p align='center'>" + description + "</p>" +
|
||||
"<p align='center'>" + copyright + "</p>" +
|
||||
"<p align='left'>" + licenseParagraph1 + "</p>" +
|
||||
"<p align='left'>" + licenseParagraph2 + "</p>";
|
||||
|
||||
aboutLabel->setText( markup );
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// "License" Button Clicked Slot
|
||||
///
|
||||
void AboutDialog::onLicenseButtonClicked()
|
||||
{
|
||||
QDesktopServices::openUrl( QUrl("http://www.gnu.org/licenses/gpl-3.0.txt") );
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// "Website" Button Clicked Slot
|
||||
///
|
||||
void AboutDialog::onWebsiteButtonClicked()
|
||||
{
|
||||
QDesktopServices::openUrl( QUrl(Version::WEBSITE) );
|
||||
}
|
||||
|
||||
aboutLabel->setText( markup );
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// "License" Button Clicked Slot
|
||||
///
|
||||
void AboutDialog::onLicenseButtonClicked()
|
||||
{
|
||||
QDesktopServices::openUrl( QUrl("http://www.gnu.org/licenses/gpl-3.0.txt") );
|
||||
}
|
||||
|
||||
|
||||
///
|
||||
/// "Website" Button Clicked Slot
|
||||
///
|
||||
void AboutDialog::onWebsiteButtonClicked()
|
||||
{
|
||||
QDesktopServices::openUrl( QUrl(Version::WEBSITE) );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user