Commit Graph

222 Commits

Author SHA1 Message Date
Jim Evins 7c945d6ba7 Added additional text merge backends. 2016-05-22 15:40:47 -04:00
Jim Evins c7f02f027a Moved Merge subsystem into merge namespace. 2016-05-22 14:38:59 -04:00
Jim Evins b1e7a6507c Moved Merge subsystem into its own subdirectory. 2016-05-22 13:01:48 -04:00
Jim Evins 691353e27b Incorporated merge printing in PrintView. 2016-05-21 22:17:46 -04:00
Jim Evins 18089d8635 Added merge printing. 2016-05-21 21:21:45 -04:00
Jim Evins 38899348f9 Added crop marks. 2016-05-21 14:08:25 -04:00
Jim Evins 91cefb7287 Added label clip path to page renderer. 2016-05-21 13:34:16 -04:00
Jim Evins 4cc6ddab6c Start new projects in unmodified state. 2016-05-21 11:59:35 -04:00
Jim Evins bcc4489ab9 Fix synchronization of conents with page. 2016-05-21 11:55:01 -04:00
Jim Evins 7b9f377b1a Use a combo box for merge field selection. 2016-05-20 23:54:46 -04:00
Jim Evins 1ce647b9a9 Don't prelight color palette button if it is not enabled. 2016-05-18 20:12:24 -04:00
Jim Evins 310cd1c307 Tweaked layout of object editor. 2016-05-18 20:07:07 -04:00
Jim Evins 9feb56f5cf Make color button swatches rectangular. 2016-05-17 23:55:07 -04:00
Jim Evins 669c1d02e7 Fleshing out of using merge for colors. 2016-05-17 23:31:52 -04:00
Jim Evins d7480f9bb8 Added custom color dialog to color palette dialog. 2016-05-15 21:59:57 -04:00
Jim Evins f920965668 Let Qt keep track of top-level windows. 2016-05-15 16:33:02 -04:00
Jim Evins 1819a02d50 Properly handle close events. 2016-05-15 16:15:32 -04:00
Jim Evins a30af8eeab Properly track modification status due to changes in merge or merge source. 2016-05-15 14:26:03 -04:00
Jim Evins 003641b8f2 Reconcile window title styles. 2016-05-14 21:31:55 -04:00
Jim Evins 8d9686430f Moved startup wizard to welcome page in main window's stacked widget. 2016-05-14 20:01:36 -04:00
Jim Evins 73b7475cbc Finished fleshing out MergeView for now. 2016-05-14 13:25:24 -04:00
Jim Evins efb4e56e74 Continuing to flesh out MergeView. 2016-05-12 23:15:00 -04:00
Jim Evins b599c56cd2 Add dummy column to fill any extra horizontal space. 2016-05-12 00:22:53 -04:00
Jim Evins 81a73c8e1e Make sure primary key is 1st column. Combine checkbox with primary field. 2016-05-11 23:56:06 -04:00
Jim Evins 8b56520fed Some fleshing out of MergeView. 2016-05-10 23:59:57 -04:00
Jim Evins 37358aac43 More fleshing out of merge framework. 2016-05-08 00:43:35 -04:00
Jim Evins 88e32d9738 More fleshing out of Merge framework and backends. 2016-05-07 16:17:29 -04:00
Jim Evins 2ff07f01b3 Continued to flesh out merge subsystem. 2016-05-01 22:42:03 -04:00
Jim Evins 3cd0806792 Removed inlines in LabelModel and LabelRegion. 2016-05-01 15:33:13 -04:00
Jim Evins ec85e2c0ef Extended undo/redo framework into ObjectEditor. 2016-04-30 20:48:57 -04:00
Jim Evins ec26cbb07a Finished extending undo/redo framework into PropertiesView. 2016-04-30 09:49:50 -04:00
Jim Evins 61c41d8ba9 Started adding undo/redo framework. 2016-04-29 23:51:01 -04:00
Jim Evins 231dc66c0d Initial framework for saving/restoring model state. 2016-04-28 22:19:56 -04:00
Jim Evins c69db1efd7 Use QByteArray instead of QString for buffers. 2016-04-24 17:27:04 -04:00
Jim Evins 6045b9e6b6 Added initial clipboard support. 2016-04-24 16:52:14 -04:00
Jim Evins 4a0fff3f33 Installed COPYING* files. 2016-04-17 22:59:47 -04:00
Jim Evins 3443fab814 Imported latest label database from Gtk version. 2016-04-17 22:39:24 -04:00
Jim Evins f7690fbbe1 Replaced tabbed pages in MainWindow with a stacked widget. 2016-04-17 22:02:33 -04:00
Jim Evins fd78c9133d Added welcome text to StartupWizard. 2016-04-17 19:56:24 -04:00
Jim Evins 004fb03325 Some reconciling of widget naming conventions. 2016-04-16 18:53:55 -04:00
Jim Evins 8cc17f5b2f Fix roation problems in renderer and previews. 2016-04-16 00:18:47 -04:00
Jim Evins fe9e8e40d2 Track product change in PrintView. 2016-04-15 23:54:03 -04:00
Jim Evins 0023106801 Handle change in product or orientation in View. 2016-04-15 23:40:40 -04:00
Jim Evins 783ede0a03 PropertiesView and View now follow Settings::units. 2016-04-14 23:10:38 -04:00
Jim Evins 2f7f4b2041 Tweak layout of widgets in object editor. 2016-04-13 20:50:06 -04:00
Jim Evins f570056880 Block value changed signal of spin boxes when updating units. 2016-04-13 20:35:49 -04:00
Jim Evins e7000f2567 Object editor now follows Settings::units(). 2016-04-13 00:00:36 -04:00
Jim Evins 642739a1ff Added custom about dialog. 2016-04-11 23:17:47 -04:00
Jim Evins 50e52d6675 Added recently-used products tab to SelectProductDialog. 2016-04-03 18:42:01 -04:00
Jim Evins 46ef01d4e4 Improved design of category selection in SelectProductDialog. 2016-04-03 01:01:14 -04:00