Skip to content

Commit

Permalink
Update copyright.
Browse files Browse the repository at this point in the history
  • Loading branch information
gijsbers committed Dec 28, 2023
1 parent 07eb300 commit 31c7346
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
13 changes: 9 additions & 4 deletions src/wmabout.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,18 @@ AboutDlg::AboutDlg(YActionListener* al):
fListener(al)
{
const char version[] = "IceWM " VERSION " (" HOSTOS "/" HOSTCPU ")";
mstring copyright = mstring("Copyright ")
+ _("(C)") + " 1997-2012 Marko Macek, "
+ _("(C)") + " 2001 Mathias Hasselmann";
mstring copyhead = mstring("Copyright\t");
mstring copysymb = mstring(_("(C)"));
mstring copyright = copyhead
+ copysymb + " 1997-2012 Marko Macek, "
+ copysymb + " 2001 Mathias Hasselmann, \n\t"
+ copysymb + " 2016-2023 Bert Gijsbers. \n";

Ladder* ladder = new Ladder();
*ladder += label(version);
*ladder += label(copyright);
YLabel* copylabel = label(copyright);
copylabel->multiline(true);
*ladder += copylabel;
*ladder += new Spacer(1, 20);

Table* table = new Table();
Expand Down
11 changes: 8 additions & 3 deletions src/ylabel.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ int YLabel::labelObjectCount;
YLabel::YLabel(const mstring &label, YWindow *parent):
YWindow(parent),
fLabel(label),
fMultied(false),
fPainted(false)
{
setParentRelative();
Expand Down Expand Up @@ -74,9 +75,13 @@ void YLabel::paint(Graphics &g, const YRect &/*r*/) {
g.setColor(labelFg);
g.setFont(labelFont);

for (s = fLabel; s.splitall('\n', &s, &r); s = r) {
g.drawChars(s, x, y);
y += h;
if (fMultied) {
g.drawStringMultiline(fLabel, x, y, width());
} else {
for (s = fLabel; s.splitall('\n', &s, &r); s = r) {
g.drawChars(s, x, y);
y += h;
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/ylabel.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ class YLabel: public YWindow {
virtual void repaint();

void setText(const char* label);
void multiline(bool enable) { fMultied = enable; }

private:
mstring fLabel;
bool fMultied;
bool fPainted;

void autoSize();
Expand Down

0 comments on commit 31c7346

Please sign in to comment.