Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dymo label templates #171

Open
wants to merge 126 commits into
base: ContinuousRollLabels
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
effd521
Less fragile layouts for PrintView and PropertiesView (#15)
jimevins Jul 24, 2018
44af49d
Include qt59translations in travis-CI (#24)
jimevins Jul 28, 2018
3322411
Renamed file.
jimevins Aug 6, 2018
f3f9f29
Include GNU barcode and libqrencode in continuous integration build e…
jimevins Sep 23, 2018
0d3aec4
Clean translations and make them ready for translators (#32)
mariobl Oct 31, 2018
b816631
Moved and renamed README.translations.md to docs/TRANSLATIONS.md. Ad…
jimevins Oct 31, 2018
f5b494d
Implemented MainWindow's TOC as a toolbar with icons and text.
jimevins Nov 4, 2018
4707aae
Simplified management of action enable/visibility states in MainWindow.
jimevins Nov 8, 2018
9ff59a2
Update to docs/CONTRIBUTING.md
jimevins Nov 11, 2018
76c370b
Fix minor typos (#37)
yurchor Nov 14, 2018
be9cdff
Propogate typo fixes to translation files.
jimevins Nov 17, 2018
0bc4b66
Preview - Add label index overlay text to preview screen (#38)
chmorgan Nov 17, 2018
1cdb397
Fixes to model::XmlUtil. Added unit tests for model::XmlUtil.
jimevins Nov 20, 2018
467ca9f
Implement continuous tape labels and path-based label shapes.
jimevins Aug 11, 2018
e5cb974
Merge branch 'ContinuousRollLabels'
jimevins Dec 1, 2018
ca6f0c7
Don't include line numbers in translation files.
jimevins Dec 1, 2018
ba3c602
Implemented compatablility import of glabels-3 project files (#39).
hochwasser Nov 4, 2018
316f391
Merge branch 'hochwasser-parser_for_fileformat_3'
jimevins Dec 2, 2018
616b452
Updated PRODUCT-TEMPLATES.md for path and continuous-tape based labels.
jimevins Dec 4, 2018
8942101
Updates to CREDITS.md file.
jimevins Dec 4, 2018
7e142bb
Automatically generate a more informative version string.
jimevins Dec 5, 2018
9024d17
Revert accidental reset of translations. (#41)
jimevins Dec 5, 2018
16d6ed1
Try not to confuse github's automatic license detection with multiple…
jimevins Dec 5, 2018
9373406
Removed all-caps section titles in README.md.
jimevins Dec 5, 2018
e0b9eeb
Fixed accidental breakage of CI.
jimevins Dec 5, 2018
9a443cd
Simplify sending glabels-batch output to stdout. (#27)
jimevins Dec 5, 2018
0d2ad97
Sync updated translations from Zanata
mariobl Dec 6, 2018
0ca05c6
Updates to README.md.
jimevins Dec 7, 2018
1afd5f7
Update to README.md.
jimevins Dec 7, 2018
b9b7922
Created placeholder for Variables page in UI.
jimevins Dec 8, 2018
3dfeb47
Added link to @krisives PPA in README.md. (#19)
jimevins Dec 15, 2018
375c957
Simple formatting fix in README.md.
jimevins Dec 15, 2018
fe6dcd6
Cleanup of CMakeLists.txt files.
jimevins Dec 20, 2018
5ea1535
Latest Appveyor CI YAML file.
jimevins Dec 20, 2018
e19e0dd
QList.size() returns int, not unsigned int.
jimevins Dec 20, 2018
8a23466
Some updates to README.md and docs/BUILD-INSTRUCTIONS-WINDOWS.md.
jimevins Dec 29, 2018
c2d024f
Added manpages for glabels-qt and glabels-batch-qt.
jimevins Dec 29, 2018
212578c
Ideal template for Dymo 30334/11345 for testing.
jimevins Jan 23, 2019
0e60c52
Added ReportBugDialog to Help menu.
jimevins Jan 28, 2019
ff9188f
Added File->"Open Recent" menu.
jimevins Jan 28, 2019
6be243d
Handle plural vs. singular cases in PrintView (#47)
jimevins Feb 20, 2019
9d8269f
Fixed incosistent control of Quick Access toolbar.
jimevins Feb 20, 2019
803f42f
Added "Toolbar" to name of "Quick Access Toolbar" in its context menu.
jimevins Feb 24, 2019
c9e26c4
Prototype of VariableView and EditVariableDialog user interface.
jimevins Mar 6, 2019
6255939
Closed MVC loop for VariablesView.
jimevins Mar 16, 2019
d05c6fb
Fleshed out input validation for EditVariableDialog.
jimevins Mar 17, 2019
dab2c19
Add window titles to "Add Variable" and "Edit Variable" dialogs.
jimevins Mar 17, 2019
879092d
Updated substitution field spec and TODO document.
jimevins Mar 17, 2019
3a425f9
Include variables in glabels project file.
jimevins Mar 18, 2019
ff15eb1
Disable focus on QTableWidgets. No more annoying highlighted cell.
jimevins Mar 23, 2019
dedbe07
Populate VariablesView headers in class rather than ui/.
jimevins Mar 23, 2019
37f0a88
Implemented variable substitution in simple print jobs.
jimevins Mar 24, 2019
efbb052
Implemented variables in merge print jobs.
jimevins Mar 25, 2019
54a66df
Increment per item, not per merge record.
jimevins Mar 25, 2019
87cc5d7
Redesigned image selection in ObjectEditor to use new FieldCombo widget.
jimevins Mar 30, 2019
d9a41c6
Don't emit selectionChanged if index is invalid.
jimevins Mar 30, 2019
88c41df
Add BUGS sections to man pages
mariobl Apr 5, 2019
1051830
Add a more informative short summary for man pages
mariobl Apr 5, 2019
775a6a7
Cleaned up english.
jimevins May 4, 2019
cb9f345
Merge branch 'mariobl-manpages' (#49)
jimevins May 4, 2019
32816d3
Fix typo
mariobl May 5, 2019
1313c2f
Fix typo (#52)
mariobl May 5, 2019
3256c40
Make version numbers of snapshots more meaningful.
jimevins May 5, 2019
b77d57a
Another method of determining branch.
jimevins May 5, 2019
5108650
Re-attach to master in CI scripts to satisfy auto version tooling.
jimevins May 6, 2019
5109da9
Restore repository depth in Travis CI script to properly count commit…
jimevins May 6, 2019
33e2d3d
Tweaks to PrintView.
jimevins May 12, 2019
eb1e771
Merge branch 'master' of github.com:jimevins/glabels-qt
jimevins May 12, 2019
2575675
Removed new to qt 5.12 feature accidentally introduced by qt designer.
jimevins May 12, 2019
f030954
Add OL1649 (#55)
May 18, 2019
2db137e
Added Herma 5078 product template (#54)
jimevins May 18, 2019
3c9a822
Typo cmake LIBZINT_LIBRARIES -> LIBZINT_LIBRARY (#60)
gitlost Jul 7, 2019
20157ec
Add missing loadRectSizePage for barcode (#62)
gitlost Jul 7, 2019
ea4099a
Removed call to deprecated QRcode_clearCache().
jimevins Jul 7, 2019
00970d8
Added MacOS build instructions (#50)
jimevins Jul 7, 2019
850c62d
Make lockAspectRatio (sizeAspectCheck) per-object (#63)
gitlost Jul 14, 2019
b33f9d2
Update BUILD-INSTRUCTIONS-LINUX.md
jimevins Jul 16, 2019
e1117d3
Handle --copies commandline argument (#64)
nblock Jul 17, 2019
f03aa0d
Update BUILD-INSTRUCTIONS-LINUX.md
jimevins Jul 19, 2019
6ab3a12
Share Model merge; Merge initializers; undo/redo descs (#65)
gitlost Jul 20, 2019
4e94933
Redesigned FieldButton.
jimevins Jul 21, 2019
3cfda79
Yet another redesign of image file selection in ObjectEditor.
jimevins Jul 21, 2019
5b9eba9
Tweaked look of image object placeholders.
jimevins Jul 21, 2019
8fa3432
Reconciled margin of VariablesView with other views.
jimevins Jul 21, 2019
1e1db1f
Incorporated FieldButton into ColorPaletteDialog. Tweaked ColorPalet…
jimevins Jul 21, 2019
cd0af02
Added default cases to switch statements.
jimevins Jul 21, 2019
f6ecdc6
Redesigned ColorHistory to include color description.
jimevins Jul 24, 2019
57cbf18
Added variables expansion to TextNode and ColorNode.
jimevins Jul 28, 2019
6fda024
Implement fields in ModelImageObject.
jimevins Jul 31, 2019
2c1c865
Update .gitignore.
jimevins Aug 3, 2019
48bfb68
Make ColorHistory more robust to change in format.
jimevins Aug 3, 2019
dd41aa3
Minor tweaking of EditVariablesDialog.
jimevins Aug 3, 2019
f41461e
Added color variable type.
jimevins Aug 3, 2019
3fedb16
Look for image files from substitution fields relative to project file.
jimevins Aug 5, 2019
c2d9a4c
Make sure keys are set for all apropos controls in ObjectEditor.
jimevins Aug 6, 2019
d4f742e
Display image filenames as relative paths.
jimevins Aug 8, 2019
ec3d900
Display merge file locations as relative paths.
jimevins Aug 13, 2019
6a789c9
Save/restore file paths as relative to project file.
jimevins Aug 19, 2019
2444cac
UserVariables branch merge
gitlost Aug 21, 2019
010879f
Add root to images search path, readImageFile svg; unit tests
gitlost Aug 21, 2019
98038e3
Make absolute image filename more Windows friendly
gitlost Aug 22, 2019
e8daa8a
Fix readImageFile to set mSvg, use in drawShadow also
gitlost Aug 23, 2019
7e44bbd
New FileUtil::makeRelativeIfInDir func; label parser_3 barcode map; u…
gitlost Aug 26, 2019
6bc0cb8
Remove XmlLabel png render tests, too system dependent
gitlost Aug 29, 2019
d9e6444
Merge pull request #72 from gitlost/UserVariables
jimevins Aug 29, 2019
f8e801e
Merge remote-tracking branch 'upstream/master'
mariobl Sep 6, 2019
242285e
Update UI translations from Transifex
mariobl Sep 6, 2019
34efe8d
Merge pull request #73 from mariobl/transifex
jimevins Sep 7, 2019
1a900d0
CI cleanup/updates
jimevins Oct 6, 2019
7a02c0b
Allow user variables to be set from glabels-batch command line (#75)
jimevins Oct 13, 2019
75e613e
Trim leading and trailing spaces from image filenames from merge reco…
jimevins Nov 12, 2019
f09ca36
Added "Open Recent" button to StartupView.
jimevins Nov 13, 2019
edcb0d7
Add workaround for non-gui environments to glabels-batch manpage. (#68)
jimevins Nov 28, 2019
bd92e6f
Increase maximum density of 2D barcodes to 64 blocks/in. (#78)
jimevins Dec 4, 2019
af607ca
Barcode tweaks.
jimevins Dec 8, 2019
aebcda4
Merge branch 'RefactorPrint'
jimevins Jan 1, 2020
2d56507
Reconciled parsing of field names with Substitution Field Spec. (#82)
jimevins Jan 1, 2020
bcc3b2f
Fixed minor cut&paste issue with man page.
jimevins Jan 3, 2020
2f331c5
Fixes issue recognizing a change in barcode backend with no change in…
jimevins Jan 12, 2020
ac93dc9
Disable Zint barcode backend for zint-2.7.x (#86)
jimevins Jan 18, 2020
7b20797
Relax code39 barcode minimum size requirements (#88)
cus Feb 29, 2020
4a9f3aa
Update TRANSLATIONS.md (#89)
juanjosepablos Mar 1, 2020
142aaf2
Glabels-batch: allow project file to be provided on stdin. (#90)
jimevins Mar 28, 2020
39c9676
Adding Herma 5028 template (#105)
tremmet Nov 28, 2020
3c33e3e
Bump required Qt version (fixes #112) (#113)
sur5r Feb 6, 2021
2da9b2d
Fix build problem when incompatible barcode.h is found. (#101)
jimevins Feb 6, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions glabels/ObjectEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ namespace glabels
loadTextPage();
loadPositionPage();
loadShadowPage();
loadRectSizePage();

setEnabled( true );
}
Expand Down
1 change: 1 addition & 0 deletions model/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ set (Model_sources
XmlCategoryParser.cpp
XmlLabelCreator.cpp
XmlLabelParser.cpp
XmlLabelParser_3.cpp
XmlPaperParser.cpp
XmlTemplateCreator.cpp
XmlTemplateParser.cpp
Expand Down
7 changes: 5 additions & 2 deletions model/XmlLabelParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#include "XmlUtil.h"
#include "DataCache.h"

#include "XmlLabelParser_3.h"

#include "barcode/Backends.h"
#include "merge/Factory.h"

Expand Down Expand Up @@ -77,7 +79,7 @@ namespace glabels
gunzip( rawData, unzippedData );
success = doc.setContent( unzippedData, false, &errorString, &errorLine, &errorColumn );
#else
qWarning() << "Warning: Cannot read compressed glabels project file! gLabels not build with ZLIB.";
qWarning() << "Warning: Cannot read compressed glabels project file! gLabels not built with ZLIB.";
return nullptr;
#endif
}
Expand Down Expand Up @@ -239,7 +241,8 @@ namespace glabels
QString version = XmlUtil::getStringAttr( node, "version", "" );
if ( version != "4.0" )
{
qWarning() << "TODO: compatibility mode.";
// Attempt to import as version 3.0 format (glabels 2.0 - glabels 3.4)
return XmlLabelParser_3::parseRootNode(node);
}

auto* label = new Model();
Expand Down
Loading