mirror of
https://github.com/zint/zint
synced 2024-11-16 20:57:25 +13:00
- API: add new zint_symbol dpmm
field for output resolution (BMP/
EMF/PCX/PNG/TIF only, i.e. excluding EPS, GIF & SVG) - Add support for specifying scale by X-dimension and resolution with new option `--scalexdimdp` for CLI/Tcl & new API function `ZBarcode_Scale_From_XdimDp()` (+ `ZBarcode_XdimDp_From_Scale()` & `ZBarcode_Default_Xdim()`) and new GUI popup; manual: document - BMP/EMF/PCX/PNG/TIF: use new `dpmm` resolution field (for EMF following Inkscape) - backend_qt: add `dpmm()`, `vectorWidth()`, `vectorHeight()`, `noPng()`, `getVersion()`, `takesGS1AIData()`, & `XdimDp` stuff incl. new `QZintXdimDp` struct for passing around scale vars & use in `getAsCLI()`; add comments - Raise `scale` limit to 200 (from 100) to allow for large dpmm - output: create directories & subdirectories as necessary for output path using new function `out_fopen()` and use in BMP/EMF/ EPS/GIF/PCX/PNG/SVG/TIF - DPLEIT/DPIDENT: format HRT according to (incomplete) documentation, and set default height to 72X (from 50X) - CODE128B renamed to CODE128AB as can use subsets A and/or B - CODABAR: fix minimum height calc - EMF: fix indexing of handles (zero-based not 1-based) - GUI: fix symbology zap (previous technique of clearing and re-loading settings without doing a sync no longer works); fix UPCEAN guard descent enable - MAILMARK: better error message if input < 14 characters - GUI: add "Default" button for DAFT tracker ratio & enable/disable various default buttons; use new `takesGS1AIData()` to enable/disable GS1-specific checkboxes - CLI: use new `validate_float()` to parse float options (7 significant digits allowed only, no scientific notation) - DATAMATRIX/GRIDMATRIX/PDF417/QR/ULTRA: micro-optimize structapp ID parse - library/CLI: fiddle with static asserts (make CHAR_BIT sensitive, supposedly) - win32/README: update building libpng (assembly removed) - README.linux: document incompatibility of Qt6 >= 6.3 - manual: expand Barcode Studio waffle - test suite: change range separator to hyphen and allow multiple excludes
This commit is contained in:
@ -24,14 +24,16 @@
|
||||
#include <QGraphicsScene>
|
||||
#include <QButtonGroup>
|
||||
|
||||
#include "ui_mainWindow.h"
|
||||
#include "barcodeitem.h"
|
||||
|
||||
class QLabel;
|
||||
class QShortcut;
|
||||
class QDoubleSpinBox;
|
||||
class QPushButton;
|
||||
|
||||
#include "ui_mainWindow.h"
|
||||
#include "barcodeitem.h"
|
||||
|
||||
class ScaleWindow;
|
||||
|
||||
class MainWindow : public QWidget, private Ui::mainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -64,7 +66,6 @@ public slots:
|
||||
void composite_ean_check();
|
||||
void maxi_scm_ui_set();
|
||||
void msi_plessey_ui_set();
|
||||
void change_print_scale();
|
||||
void change_cmyk();
|
||||
void autoheight_ui_set();
|
||||
void HRTShow_ui_set();
|
||||
@ -74,6 +75,7 @@ public slots:
|
||||
void on_encoded();
|
||||
void on_errored();
|
||||
void on_dataChanged(const QString& text, bool escaped, int seg_no);
|
||||
void on_scaleChanged(double scale);
|
||||
void filter_symbologies();
|
||||
|
||||
bool save();
|
||||
@ -97,6 +99,7 @@ public slots:
|
||||
void clear_composite();
|
||||
void zap();
|
||||
void open_cli_dialog();
|
||||
void open_scale_dialog();
|
||||
|
||||
void copy_to_clipboard_bmp();
|
||||
void copy_to_clipboard_emf();
|
||||
@ -112,8 +115,11 @@ public slots:
|
||||
void height_per_row_disable();
|
||||
void height_per_row_default();
|
||||
|
||||
void guard_reset_upcean();
|
||||
void guard_reset_upca();
|
||||
void guard_default_upcean();
|
||||
void guard_default_upca();
|
||||
|
||||
void daft_ui_set();
|
||||
void daft_tracker_default();
|
||||
|
||||
void view_context_menu(const QPoint &pos);
|
||||
void errtxtBar_context_menu(const QPoint &pos);
|
||||
@ -134,9 +140,11 @@ protected:
|
||||
virtual bool eventFilter(QObject *watched, QEvent *event) override;
|
||||
|
||||
void combobox_item_enabled(QComboBox *comboBox, int index, bool enabled);
|
||||
void upcean_addon_gap(const QString &comboBoxName, const QString &labelName, int base);
|
||||
void upcean_guard_descent(const QString &spnBoxName, const QString &labelName);
|
||||
void guard_reset(const QString &spnBoxName);
|
||||
bool upcean_addon_gap(const QString &comboBoxName, const QString &labelName, int base);
|
||||
void upcean_guard_descent(const QString &spnBoxName, const QString &labelName, const QString &btnDefaultName,
|
||||
bool enabled = true);
|
||||
void guard_default(const QString &spnBoxName);
|
||||
double get_height_per_row_default();
|
||||
void set_gs1_mode(bool gs1_mode);
|
||||
void set_smaller_font(const QString &labelName);
|
||||
|
||||
@ -187,6 +195,11 @@ protected:
|
||||
void save_sub_settings(QSettings &settings, int symbology);
|
||||
void load_sub_settings(QSettings &settings, int symbology);
|
||||
|
||||
void size_msg_ui_set();
|
||||
|
||||
float get_dpmm(const struct Zint::QZintXdimDpVars *vars) const;
|
||||
const char *getFileType(const struct Zint::QZintXdimDpVars *vars, bool msg = false) const;
|
||||
|
||||
private:
|
||||
QColor m_fgcolor, m_bgcolor;
|
||||
QByteArray m_fgcolor_geometry, m_bgcolor_geometry;
|
||||
@ -223,6 +236,8 @@ private:
|
||||
QDoubleSpinBox *m_spnHeightPerRow;
|
||||
QPushButton *m_btnHeightPerRowDisable;
|
||||
QPushButton *m_btnHeightPerRowDefault;
|
||||
struct Zint::QZintXdimDpVars m_xdimdpVars;
|
||||
ScaleWindow *m_scaleWindow;
|
||||
};
|
||||
|
||||
/* vim: set ts=4 sw=4 et : */
|
||||
|
Reference in New Issue
Block a user