Commit Graph

60 Commits

Author SHA1 Message Date
Jaye Evins 4c0ce1146a Improvements to SelectTemplateDialog (#109 and #142)
- Added side pane for product preview and information
- Product selection is done with a separate pushbutton, so that user gets a
  chance to preview the complete product information before committing to the
  selection
- Supports two view modes: Grid View and List View
- View mode is automatically stored in Settings, so it will default to the
  user's prefered mode
- Should address most concerns in #109 and #142
2025-05-26 19:23:36 -04:00
Jaye Evins ca68c84cad Handle filenames with periods in basename consistently. (#199)
Use QFileInfo::completeBaseName() instead of QFileInfo::baseName() in
Model::shortName().  This was already the case when building list of
recent labels in MainWindow.
2025-05-15 00:02:47 -04:00
Jaye Evins 18b0a1b09b Minor bug fixes
- model::Db::lookupPaperNameFromId() bad if-else-if
- model::StrUtil::formatFraction missing arg in QString
- Added unit tests for StrUtil
2025-05-08 11:09:11 -04:00
Jaye Evins f15c21a01d Update to Qt6
- New baseline minimum platform is Ubuntu 22.04
    - Qt6 requires at least 6.2
        - some deprecations may be flagged on later versions (e.g. 6.8)
    - CMake requires at least 3.22
- Include build-tests.yml github action to validate builds on mulitple platforms
- QtTest is no longer optional since it easily comes along for the ride with Qt
- Replaced QStringRef in model::SubstitutionField with simple ParserState class
- Removed deprecations up to Qt 6.2
2025-05-06 18:26:53 -04:00
Jim Lieb be567f90eb Update Qt dependency from QT 5.6 to QT 5.15 (#162)
* Update QT5 references 5.6 -> 5.15

Builds and runs but now needs deprecated -> current updates.

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Update build instructions for Fedora 35 particulars

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QtString::sprintf with QtString::arg

This was deprecated some revisions prior to 5.15.

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QtString::SkipEmptyParts with Qt::SkipEmptyParts

Builds now with 5.15

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QPrinter::setPageMargins with 5.15 version

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QImage::byteCount() with QImage::sizeInBytes()

This could be problematic if qsizetype differs from int

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated endl with QT::endl

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

* Replace deprecated QMatrix with QTransform

Signed-off-by: Jim Lieb <lieb@sea-troll.net>

---------

Signed-off-by: Jim Lieb <lieb@sea-troll.net>
2025-04-28 22:16:28 -04:00
Jaye Evins f8efe3aafa Update all occurrences of my name with my legal name. 2025-04-08 18:47:02 -04:00
Jim Evins 2d5650767a Reconciled parsing of field names with Substitution Field Spec. (#82)
According to the spec., valid syntax for merge field names is determined
by the merge source with a couple of minor exceptions.  Current text backends
allow any printable characters, so the SubstitutionField parser now accepts
any printable characters.
2020-01-01 17:04:19 -05:00
Jim Evins aebcda43cb Merge branch 'RefactorPrint'
- Modifies printing model to be similar to glabels-3.x.
   - Allow simple projects to print by-the-page (#51)
   - Added collated vs uncollated document merges
- Added ability to separate merge groups by page
- Updated man pages
- Updated misc developer documentation
2020-01-01 14:35:15 -05:00
Jim Evins 75e613e9f1 Trim leading and trailing spaces from image filenames from merge records. (#76) 2019-11-11 23:21:34 -05:00
Jim Evins 7a02c0b226 Allow user variables to be set from glabels-batch command line (#75) 2019-10-12 21:57:04 -04:00
gitlost 6bc0cb8443 Remove XmlLabel png render tests, too system dependent 2019-08-29 08:10:27 +01:00
gitlost 7e44bbdc06 New FileUtil::makeRelativeIfInDir func; label parser_3 barcode map; unit tests 2019-08-26 03:00:32 +01:00
gitlost e8daa8aa48 Fix readImageFile to set mSvg, use in drawShadow also 2019-08-23 09:27:14 +01:00
gitlost 98038e34e7 Make absolute image filename more Windows friendly 2019-08-23 00:56:31 +01:00
gitlost 010879fa71 Add root to images search path, readImageFile svg; unit tests 2019-08-21 15:04:52 +01:00
gitlost 2444cacb74 UserVariables branch merge 2019-08-21 03:37:56 +01:00
Jim Evins 6a789c9632 Save/restore file paths as relative to project file. 2019-08-18 21:56:37 -04:00
Jim Evins 3fedb16c2c Look for image files from substitution fields relative to project file. 2019-08-04 23:32:50 -04:00
Jim Evins f41461ef26 Added color variable type. 2019-08-03 17:16:14 -04:00
Jim Evins 6fda0246a8 Implement fields in ModelImageObject. 2019-07-30 21:26:16 -04:00
Jim Evins 57cbf18039 Added variables expansion to TextNode and ColorNode. 2019-07-27 22:00:05 -04:00
Jim Evins cd0af020c6 Added default cases to switch statements. 2019-07-21 19:26:03 -04:00
Jim Evins 5b9eba9af9 Tweaked look of image object placeholders. 2019-07-21 13:17:45 -04:00
gitlost 6ab3a12b92 Share Model merge; Merge initializers; undo/redo descs (#65)
- use "shared" pointer between Model and undo/redo instances
- adds missing initializers to Merge and Text classes
- adds checkpoints for mouse resize, barcode, and image reset.
- renames the position dialog checkpoint from Move -> Position to differentiate it from a mouse move.
- adds the Undo/Redo action descriptions to the menu items.
- adds unit tests for the Merge and Model change, and for ColorNode, RawText and TextNode.
2019-07-20 14:41:01 -04:00
gitlost 850c62ddd0 Make lockAspectRatio (sizeAspectCheck) per-object (#63)
* Make lockAspectRatio (sizeAspectCheck) per-object
* Added unit tests for XmlLabelCreator and XmlLabelParser.
2019-07-13 22:18:30 -04:00
Jim Evins 3256c407fb Make version numbers of snapshots more meaningful. 2019-05-05 14:45:44 -04:00
Jim Evins 54a66dfd8f Increment per item, not per merge record. 2019-03-24 22:33:40 -04:00
Jim Evins efbb052856 Implemented variables in merge print jobs. 2019-03-24 20:22:12 -04:00
Jim Evins 37f0a8890d Implemented variable substitution in simple print jobs. 2019-03-24 17:49:41 -04:00
Jim Evins 3a425f932a Include variables in glabels project file. 2019-03-17 22:38:45 -04:00
Jim Evins 6255939f39 Closed MVC loop for VariablesView. 2019-03-16 18:12:17 -04:00
Jim Evins c9e26c45fb Prototype of VariableView and EditVariableDialog user interface. 2019-03-05 21:35:11 -05:00
Jim Evins ff9188f7e7 Added File->"Open Recent" menu.
Initially based on pull request #40 by hochwasser <oo.o+github@windbuechse.samba-tng.org>, with refactoring.
2019-01-28 12:28:45 -05:00
Jim Evins 0e60c52d4c Added ReportBugDialog to Help menu.
- Also renamed "File" toolbar to "Quick Access" toolbar (#13).
2019-01-27 21:46:56 -05:00
Jim Evins 212578c380 Ideal template for Dymo 30334/11345 for testing. 2019-01-22 22:14:22 -05:00
Jim Evins e19e0dd3d9 QList.size() returns int, not unsigned int. 2018-12-19 23:53:04 -05:00
Jim Evins fe6dcd6a7f Cleanup of CMakeLists.txt files.
- Bumped required cmake version to 3.9.
 - Added Appveyor CI YAML file for Windows builds
2018-12-19 23:23:59 -05:00
Jim Evins 7e142bb57d Automatically generate a more informative version string. 2018-12-04 22:56:51 -05:00
Jim Evins 316f3915bd Merge branch 'hochwasser-parser_for_fileformat_3' 2018-12-02 16:52:24 -05:00
hochwasser ba3c60216f Implemented compatablility import of glabels-3 project files (#39). 2018-12-02 16:36:02 -05:00
Jim Evins e5cb97441d Merge branch 'ContinuousRollLabels' 2018-11-30 21:04:41 -05:00
Jim Evins 467ca9fc62 Implement continuous tape labels and path-based label shapes.
- Added "roll" as a special paper id
- Added roll_width attribute to draw tape in previews
- Updated Brother QL-500/* label templates
- Preserve print dialog settings between print jobs.
- Added path based labels for arbitrary shaped labels.
- Fleshed out implementation of continuous labels.
2018-11-30 20:30:10 -05:00
Jim Evins 1cdb3979ab Fixes to model::XmlUtil. Added unit tests for model::XmlUtil. 2018-11-19 23:00:28 -05:00
Yuri Chornoivan 76c370bf52 Fix minor typos (#37) 2018-11-13 19:01:14 -05:00
Jim Evins 12b02d2521 Implemented text auto shrink feature. 2018-07-08 20:39:14 -04:00
Jim Evins 0832acabf5 Added wrap mode attribute to text box. 2018-07-04 20:58:03 -04:00
Jim Evins 03a8e29396 Expand barcode merge fields. (#18) 2018-07-03 21:46:21 -04:00
Jim Evins a0e1dae5cf Implemented TemplateDesigner. 2018-04-07 22:24:09 -04:00
Jim Evins 931294a0f9 Validate "encoding" attribute of "image/png" file nodes. 2018-02-10 16:06:01 -05:00
Jim Evins 2b5ad625e4 Initialize previously uninitialized members. 2018-02-03 21:29:29 -05:00