- zint_symbol->fgcolour & bgcolour buffer lengths extended 10

-> 16 to allow for "C,M,Y,K" comma-separated decimal percentage
  strings
- API/CLI/GUI: allow foreground/background colours to be specified
  as comma-separated decimal "C,M,Y,K" strings where "C", "M" etc.
  are percentages (0-100) (ticket #281, 3rd point)
- output.c: new funcs `out_colour_get_rgb()` & `out_colour_get_cmyk()`
  and use in bmp/emf/gif etc.
- PCX: add alpha support
- GUI: fix fg/gbcolor icon background not being reset on zap
- GUI: Rearrange some Appearance tab inputs (Border Type <-> Width,
  Show Text <-> Font, Text/Font <-> Printing Scale/Size) to flow
  more naturally (hopefully)
- GUI: save button "Save As..." -> "Save..." and add icon
- CLI: add --bgcolor/colour & --fgcolor/colour synonyms
This commit is contained in:
gitlost 2023-01-29 19:51:11 +00:00
parent 48eaa0cc4e
commit ab2abccdb6
55 changed files with 1439 additions and 886 deletions

View file

@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (C) 2008 by BogDan Vatra <bogdan@licentia.eu> *
* Copyright (C) 2009-2022 by Robin Stuart <rstuart114@gmail.com> *
* Copyright (C) 2009-2023 by Robin Stuart <rstuart114@gmail.com> *
* *
* 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 *
@ -129,11 +129,10 @@ protected:
bool clear_data_eci_seg(int seg_no);
void color_clicked(QColor &color, QLineEdit *txt, QPushButton *btn, const QString& title, QByteArray& geometry,
const char *color_changed);
void color_edited(QColor &color, QLineEdit *txt, QPushButton *btn);
QString getColorStr(const QColor color, bool alpha_always = false);
void setColorTxtBtn(const QColor color, QLineEdit *txt, QPushButton* btn);
void color_clicked(QString &colorStr, QLineEdit *txt, QPushButton *btn, const QString& title,
QByteArray& geometry, const char *color_changed);
void color_edited(QString &colorStr, QLineEdit *txt, QPushButton *btn);
void setColorTxtBtn(const QString &colorStr, QLineEdit *txt, QPushButton* btn);
virtual void resizeEvent(QResizeEvent *event) override;
virtual bool event(QEvent *event) override;
@ -201,7 +200,7 @@ protected:
const char *getFileType(const struct Zint::QZintXdimDpVars *vars, bool msg = false) const;
private:
QColor m_fgcolor, m_bgcolor;
QString m_fgstr, m_bgstr;
QByteArray m_fgcolor_geometry, m_bgcolor_geometry;
BarcodeItem m_bc;
QWidget *m_optionWidget;