Structural changes and updates from tgotic

This commit is contained in:
hooper114 2009-11-22 15:38:15 +00:00
parent 073669a30f
commit dcefa4eee1
6 changed files with 1013 additions and 927 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,42 +1,85 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <winver.h> #include <winver.h>
#ifdef GCC_WINDRES #ifdef GCC_WINDRES
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
#else #else
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
#endif #endif
FILEVERSION 2,3,0,0 FILEVERSION 2,3,0,0
PRODUCTVERSION 2,3,0,0 PRODUCTVERSION 2,3,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0 FILEFLAGS 0
#endif #endif
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP FILETYPE VFT_APP
FILESUBTYPE VFT2_UNKNOWN FILESUBTYPE VFT2_UNKNOWN
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904E4" BLOCK "040904E4"
//language ID = U.S. English, char set = Windows, Multilingual //language ID = U.S. English, char set = Windows, Multilingual
BEGIN BEGIN
VALUE "FileDescription", "zint barcode generator\0" VALUE "FileDescription", "zint barcode generator\0"
VALUE "FileVersion", "2.3.0.0\0" VALUE "FileVersion", "2.3.0.0\0"
VALUE "InternalName", "zint.exe\0" VALUE "InternalName", "zint.exe\0"
VALUE "LegalCopyright", "Copyright © 2009 Robin Stuart & BogDan Vatra\0" VALUE "LegalCopyright", "Copyright © 2009 Robin Stuart & BogDan Vatra\0"
VALUE "OriginalFilename", "zint.exe\0" VALUE "OriginalFilename", "zint.exe\0"
VALUE "ProductName", "zint\0" VALUE "ProductName", "zint\0"
VALUE "ProductVersion", "2.3.0.0\0" VALUE "ProductVersion", "2.3.0.0\0"
VALUE "License", "GNU General Public License version 3\0" VALUE "License", "GNU General Public License version 3\0"
VALUE "WWW", "http://www.sourceforge.net/projects/zint\0" VALUE "WWW", "http://www.sourceforge.net/projects/zint\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x0409, 1250 VALUE "Translation", 0x0409, 1250
END END
END END
100 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "zint_black.ico"

View File

@ -1,103 +1,103 @@
/* /*
Zint Barcode Generator - the open source barcode generator Zint Barcode Generator - the open source barcode generator
Copyright (C) 2009 Robin Stuart <robin@zint.org.uk> Copyright (C) 2009 Robin Stuart <robin@zint.org.uk>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <QDebug> #include <QDebug>
#include <QFileDialog> #include <QFileDialog>
#include <QUiLoader> #include <QUiLoader>
#include <QStringList> #include <QStringList>
#include <QMessageBox> #include <QMessageBox>
#include "datawindow.h" #include "datawindow.h"
#include <stdio.h> #include <stdio.h>
DataWindow::DataWindow() DataWindow::DataWindow()
{ {
setupUi(this); setupUi(this);
connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now())); connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now()));
connect(btnReset, SIGNAL( clicked( bool )), SLOT(clear_data())); connect(btnReset, SIGNAL( clicked( bool )), SLOT(clear_data()));
connect(btnOK, SIGNAL( clicked( bool )), SLOT(okay())); connect(btnOK, SIGNAL( clicked( bool )), SLOT(okay()));
} }
DataWindow::DataWindow(QString input) DataWindow::DataWindow(QString input)
{ {
setupUi(this); setupUi(this);
txtDataInput->setPlainText(input); txtDataInput->setPlainText(input);
txtDataInput->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); txtDataInput->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now())); connect(btnCancel, SIGNAL( clicked( bool )), SLOT(quit_now()));
connect(btnReset, SIGNAL( clicked( bool )), SLOT(clear_data())); connect(btnReset, SIGNAL( clicked( bool )), SLOT(clear_data()));
connect(btnOK, SIGNAL( clicked( bool )), SLOT(okay())); connect(btnOK, SIGNAL( clicked( bool )), SLOT(okay()));
connect(btnFromFile, SIGNAL( clicked( bool )), SLOT(from_file())); connect(btnFromFile, SIGNAL( clicked( bool )), SLOT(from_file()));
} }
DataWindow::~DataWindow() DataWindow::~DataWindow()
{ {
} }
void DataWindow::quit_now() void DataWindow::quit_now()
{ {
Valid = 0; Valid = 0;
close(); close();
} }
void DataWindow::clear_data() void DataWindow::clear_data()
{ {
txtDataInput->clear(); txtDataInput->clear();
} }
void DataWindow::okay() void DataWindow::okay()
{ {
Valid = 1; Valid = 1;
DataOutput = txtDataInput->toPlainText(); DataOutput = txtDataInput->toPlainText();
close(); close();
} }
void DataWindow::from_file() void DataWindow::from_file()
{ {
//QString fileName; //QString fileName;
//QFileDialog fdialog; //QFileDialog fdialog;
QFile file; QFile file;
//fdialog.setFileMode(QFileDialog::ExistingFile); //fdialog.setFileMode(QFileDialog::ExistingFile);
// //
//if(fdialog.exec()) { //if(fdialog.exec()) {
// fileName = fdialog.selectedFiles().at(0); // fileName = fdialog.selectedFiles().at(0);
//} else { //} else {
// return; // return;
//} //}
QString fileName = QFileDialog::getOpenFileName(this, QString fileName = QFileDialog::getOpenFileName(this,
tr("Open File"), tr("Open File"),
"./", "./",
tr("All Files (*);;Text Files (*.txt)")); tr("All Files (*);;Text Files (*.txt)"));
if (fileName.isEmpty()) if (fileName.isEmpty())
return; return;
file.setFileName(fileName); file.setFileName(fileName);
if(!file.open(QIODevice::ReadOnly)) { if(!file.open(QIODevice::ReadOnly)) {
QMessageBox::critical(this, tr("Open Error"), tr("Could not open selected file.")); QMessageBox::critical(this, tr("Open Error"), tr("Could not open selected file."));
return; return;
} }
QByteArray outstream = file.readAll(); QByteArray outstream = file.readAll();
txtDataInput->setPlainText(QString(outstream)); txtDataInput->setPlainText(QString(outstream));
file.close(); file.close();
} }

View File

@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>42 x 40 (Version 3)</string> <string>42 x 42 (Version 3)</string>
</property> </property>
</item> </item>
<item> <item>

View File

@ -30,7 +30,7 @@
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/images/zico.png</normaloff>:/images/zico.png</iconset> <normaloff>:/images/zint_white.png</normaloff>:/images/zint_white.png</iconset>
</property> </property>
<property name="locale"> <property name="locale">
<locale language="English" country="UnitedStates"/> <locale language="English" country="UnitedStates"/>

View File

@ -1,42 +1,85 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <winver.h> #include <winver.h>
#ifdef GCC_WINDRES #ifdef GCC_WINDRES
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
#else #else
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
#endif #endif
FILEVERSION 2,3,0,0 FILEVERSION 2,3,0,0
PRODUCTVERSION 2,3,0,0 PRODUCTVERSION 2,3,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
#else #else
FILEFLAGS 0 FILEFLAGS 0
#endif #endif
FILEOS VOS_NT_WINDOWS32 FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP FILETYPE VFT_APP
FILESUBTYPE VFT2_UNKNOWN FILESUBTYPE VFT2_UNKNOWN
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "000904b0" BLOCK "000904b0"
BEGIN BEGIN
VALUE "CompanyName", "Robin Stuart & BogDan Vatra" VALUE "CompanyName", "Robin Stuart & BogDan Vatra"
VALUE "FileDescription", "qtZint barcode generator" VALUE "FileDescription", "qtZint barcode generator"
VALUE "FileVersion", "2.3.0.0" VALUE "FileVersion", "2.3.0.0"
VALUE "InternalName", "qtZint" VALUE "InternalName", "qtZint"
VALUE "LegalCopyright", "Copyright © 2009 Robin Stuart & BogDan Vatra" VALUE "LegalCopyright", "Copyright © 2009 Robin Stuart & BogDan Vatra"
VALUE "License", "GNU General Public License version 3" VALUE "License", "GNU General Public License version 3"
VALUE "OriginalFilename", "qtZint" VALUE "OriginalFilename", "qtZint"
VALUE "ProductName", "qtZint" VALUE "ProductName", "qtZint"
VALUE "ProductVersion", "2.3.0.0" VALUE "ProductVersion", "2.3.0.0"
VALUE "WWW", "http://www.zint.org.uk" VALUE "WWW", "http://www.zint.org.uk"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x9, 1200 VALUE "Translation", 0x9, 1200
END END
END END
100 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "zint_white.ico"