From e81a5b73170ac6c1efc775e056ae017a3ee0846f Mon Sep 17 00:00:00 2001 From: Rik Hemsley Date: Thu, 30 Mar 2000 00:43:51 +0000 Subject: [PATCH] Now active titlebar is black, NeXT-style. Very good contrast ! :) svn path=/trunk/kdebase/kwin/; revision=45107 --- clients/riscos/button_base_down_active.xpm | 29 ++++ clients/riscos/button_base_up_active.xpm | 29 ++++ clients/riscos/button_close_active.xpm | 19 +++ clients/riscos/button_iconify_active.xpm | 19 +++ clients/riscos/button_lower_active.xpm | 20 +++ clients/riscos/button_max_active.xpm | 19 +++ clients/riscos/button_unmax_active.xpm | 19 +++ clients/riscos/riscosclient.cpp | 177 +++++++++++++-------- clients/riscos/riscosclient.h | 14 +- clients/riscos/title_active.xpm | 30 ++-- clients/riscos/title_active_left.xpm | 39 ++--- clients/riscos/title_active_right.xpm | 47 +++--- 12 files changed, 335 insertions(+), 126 deletions(-) create mode 100644 clients/riscos/button_base_down_active.xpm create mode 100644 clients/riscos/button_base_up_active.xpm create mode 100644 clients/riscos/button_close_active.xpm create mode 100644 clients/riscos/button_iconify_active.xpm create mode 100644 clients/riscos/button_lower_active.xpm create mode 100644 clients/riscos/button_max_active.xpm create mode 100644 clients/riscos/button_unmax_active.xpm diff --git a/clients/riscos/button_base_down_active.xpm b/clients/riscos/button_base_down_active.xpm new file mode 100644 index 0000000000..45d5e26d95 --- /dev/null +++ b/clients/riscos/button_base_down_active.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * button_base_down_active_xpm[] = { +"18 18 8 1", +" c None", +". c #000000", +"+ c #303030", +"@ c #585858", +"# c #C3C3C3", +"$ c #808080", +"% c #DCDCDC", +"& c #FFFFFF", +".+++++++++++++++@#", +"+@@@@@@@@@@@@@@@$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"+@..............$%", +"@$$$$$$$$$$$$$$$#%", +"#%%%%%%%%%%%%%%%%&"}; diff --git a/clients/riscos/button_base_up_active.xpm b/clients/riscos/button_base_up_active.xpm new file mode 100644 index 0000000000..96cbc8440f --- /dev/null +++ b/clients/riscos/button_base_up_active.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * button_base_up_active_xpm[] = { +"18 18 8 1", +" c None", +". c #FFFFFF", +"+ c #DCDCDC", +"@ c #C3C3C3", +"# c #808080", +"$ c #585858", +"% c #000000", +"& c #303030", +".++++++++++++++++@", +"+@###############$", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#%%%%%%%%%%%%%%$&", +"+#$$$$$$$$$$$$$$$&", +"@$&&&&&&&&&&&&&&&%"}; diff --git a/clients/riscos/button_close_active.xpm b/clients/riscos/button_close_active.xpm new file mode 100644 index 0000000000..1544ade215 --- /dev/null +++ b/clients/riscos/button_close_active.xpm @@ -0,0 +1,19 @@ +/* XPM */ +static char * button_close_active_xpm[] = { +"12 12 4 1", +" c None", +". c #585858", +"+ c #FFFFFF", +"@ c #303030", +".++. .++.", +"+..+. .+..+", +"+...+@@+...+", +".+...++...+.", +" .+......+. ", +" @+....+@ ", +" @+....+@ ", +" .+......+. ", +".+...++...+.", +"+...+@@+...+", +"+..+. .+..+", +".++. .++."}; diff --git a/clients/riscos/button_iconify_active.xpm b/clients/riscos/button_iconify_active.xpm new file mode 100644 index 0000000000..641e87cc9b --- /dev/null +++ b/clients/riscos/button_iconify_active.xpm @@ -0,0 +1,19 @@ +/* XPM */ +static char * button_iconify_active_xpm[] = { +"12 12 4 1", +" c None", +". c #A0A0A0", +"+ c #FFFFFF", +"@ c #585858", +" ", +" ", +" ", +" ", +" .++++++++. ", +" +@@@@@@@@+ ", +" +@@@@@@@@+ ", +" .++++++++. ", +" ", +" ", +" ", +" "}; diff --git a/clients/riscos/button_lower_active.xpm b/clients/riscos/button_lower_active.xpm new file mode 100644 index 0000000000..cc71b15395 --- /dev/null +++ b/clients/riscos/button_lower_active.xpm @@ -0,0 +1,20 @@ +/* XPM */ +static char * button_lower_active_xpm[] = { +"12 12 5 1", +" c None", +". c #A0A0A0", +"+ c #FFFFFF", +"@ c #808080", +"# c #585858", +".++++++. ", +"+@@@@@@+ ", +"+@@@@@@+ ", +"+@@@@@@. ", +"+@@@.++++++.", +"+@@@+##@###+", +"+@@@+##.###+", +".++.+@..###+", +" +######+", +" +######+", +" +######+", +" .++++++."}; diff --git a/clients/riscos/button_max_active.xpm b/clients/riscos/button_max_active.xpm new file mode 100644 index 0000000000..628767e611 --- /dev/null +++ b/clients/riscos/button_max_active.xpm @@ -0,0 +1,19 @@ +/* XPM */ +static char * button_max_active_xpm[] = { +"12 12 4 1", +" c None", +". c #A0A0A0", +"+ c #FFFFFF", +"@ c #585858", +" ", +" ", +" .++++++. ", +" +@@@@@@+ ", +" +@@@@@@+ ", +" +@@@@@@+ ", +" +@@@@@@+ ", +" +@@@@@@+ ", +" +@@@@@@+ ", +" .++++++. ", +" ", +" "}; diff --git a/clients/riscos/button_unmax_active.xpm b/clients/riscos/button_unmax_active.xpm new file mode 100644 index 0000000000..64ce4e4282 --- /dev/null +++ b/clients/riscos/button_unmax_active.xpm @@ -0,0 +1,19 @@ +/* XPM */ +static char * button_unmax_active_xpm[] = { +"12 12 4 1", +" c None", +". c #A0A0A0", +"+ c #FFFFFF", +"@ c #585858", +".++++++++++.", +"+@@@@@@@@@@+", +"+@@@@@@@@@@+", +"+@@@@@@@@@@+", +"+@@@@@@@@@@+", +"+@@@@@@@@@@+", +"+@@@@@@@@@@+", +"+@@@@@@@@@@+", +"+@@@@@@@@@@+", +"+@@@@@@@@@@+", +"+@@@@@@@@@@+", +".++++++++++."}; diff --git a/clients/riscos/riscosclient.cpp b/clients/riscos/riscosclient.cpp index a5b8fa2d60..2497fd7afb 100644 --- a/clients/riscos/riscosclient.cpp +++ b/clients/riscos/riscosclient.cpp @@ -41,11 +41,18 @@ #include "resize_bar_right.xpm" #include "button_base_up.xpm" #include "button_base_down.xpm" +#include "button_base_up_active.xpm" +#include "button_base_down_active.xpm" #include "button_close.xpm" #include "button_unmax.xpm" #include "button_max.xpm" #include "button_lower.xpm" #include "button_iconify.xpm" +#include "button_close_active.xpm" +#include "button_unmax_active.xpm" +#include "button_max_active.xpm" +#include "button_lower_active.xpm" +#include "button_iconify_active.xpm" #include @@ -59,27 +66,35 @@ extern "C" using namespace RiscOS; -QPixmap * px_button_base_up = 0L; -QPixmap * px_button_base_down = 0L; -QPixmap * px_button_iconify = 0L; -QPixmap * px_button_close = 0L; -QPixmap * px_button_lower = 0L; -QPixmap * px_button_max = 0L; -QPixmap * px_button_unmax = 0L; -QPixmap * px_title_inactive_left = 0L; -QPixmap * px_title_inactive = 0L; -QPixmap * px_title_inactive_right = 0L; -QPixmap * px_title_active_left = 0L; -QPixmap * px_title_active = 0L; -QPixmap * px_title_active_right = 0L; -QPixmap * px_resize_left = 0L; -QPixmap * px_resize_mid = 0L; -QPixmap * px_resize_right = 0L; +QPixmap * px_button_base_up = 0L; +QPixmap * px_button_base_down = 0L; +QPixmap * px_button_base_up_active = 0L; +QPixmap * px_button_base_down_active = 0L; +QPixmap * px_button_iconify = 0L; +QPixmap * px_button_close = 0L; +QPixmap * px_button_lower = 0L; +QPixmap * px_button_max = 0L; +QPixmap * px_button_unmax = 0L; +QPixmap * px_button_iconify_active = 0L; +QPixmap * px_button_close_active = 0L; +QPixmap * px_button_lower_active = 0L; +QPixmap * px_button_max_active = 0L; +QPixmap * px_button_unmax_active = 0L; +QPixmap * px_title_inactive_left = 0L; +QPixmap * px_title_inactive = 0L; +QPixmap * px_title_inactive_right = 0L; +QPixmap * px_title_active_left = 0L; +QPixmap * px_title_active = 0L; +QPixmap * px_title_active_right = 0L; +QPixmap * px_resize_left = 0L; +QPixmap * px_resize_mid = 0L; +QPixmap * px_resize_right = 0L; Button::Button(Manager * parent) : QButton(parent, "Button"), client_(parent), - px_symbol_(0L) + px_symbol_inactive_(0L), + px_symbol_active_(0L) { setFixedSize(18, 18); @@ -89,21 +104,33 @@ Button::Button(Manager * parent) } void -Button::drawButton(QPainter * p) +Button::update() { - if (isDown()) - p->drawPixmap(0, 0, *px_button_base_down); - else - p->drawPixmap(0, 0, *px_button_base_up); - - if (px_symbol_ != 0) - p->drawPixmap(3, 3, *px_symbol_); + repaint(false); } void -Button::setSymbol(QPixmap * p) +Button::drawButton(QPainter * p) { - px_symbol_ = p; + // Excuse my minimalism. + QPixmap * px = + client_->isActive() ? + (isDown() ? px_button_base_down_active : px_button_base_up_active) : + (isDown() ? px_button_base_down : px_button_base_up); + + p->drawPixmap(0, 0, *px); + + if (client_->isActive()) + p->drawPixmap(3, 3, *px_symbol_active_); + else + p->drawPixmap(3, 3, *px_symbol_inactive_); +} + + void +Button::setSymbols(QPixmap * inactive, QPixmap * active) +{ + px_symbol_inactive_ = inactive; + px_symbol_active_ = active; repaint(false); } @@ -111,36 +138,36 @@ LowerButton::LowerButton(Manager * parent) : Button(parent) { // TODO connect(this, SIGNAL(clicked()), client(), (SLOT(lowerAndDeactivate()))); - setSymbol(px_button_lower); + setSymbols(px_button_lower, px_button_lower_active); } CloseButton::CloseButton(Manager * parent) : Button(parent) { connect(this, SIGNAL(clicked()), client(), (SLOT(closeWindow()))); - setSymbol(px_button_close); + setSymbols(px_button_close, px_button_close_active); } IconifyButton::IconifyButton(Manager * parent) : Button(parent) { connect(this, SIGNAL(clicked()), client(), (SLOT(iconify()))); - setSymbol(px_button_iconify); + setSymbols(px_button_iconify, px_button_iconify_active); } MaximiseButton::MaximiseButton(Manager * parent) : Button(parent) { - setSymbol(px_button_unmax); + setSymbols(px_button_max, px_button_max_active); } void MaximiseButton::setOn(bool on) { if (on) - setSymbol(px_button_unmax); + setSymbols(px_button_unmax, px_button_unmax_active); else - setSymbol(px_button_max); + setSymbols(px_button_max, px_button_max_active); } void @@ -207,7 +234,7 @@ TitleBar::_updatePixmap() p.drawPixmap(0, 0, *px_title_active_left); p.drawTiledPixmap(2, 0, width() - 4, 18, *px_title_active); p.drawPixmap(width() - 2, 0, *px_title_active_right); - p.setPen(Qt::black); + p.setPen(Qt::white); p.setFont(options->font()); p.drawText(3, 0, width() - 6, 18, AlignCenter, client_->caption()); @@ -533,6 +560,10 @@ Manager::captionChange(const QString &) Manager::activeChange(bool b) { title_->update(); + lower_->update(); + close_->update(); + iconify_->update(); + maximize_->update(); } void @@ -589,40 +620,54 @@ Manager::_loadPixmaps() { if (pixmapsLoaded_) { - delete px_button_base_up; px_button_base_up = 0L; - delete px_button_base_down; px_button_base_down = 0L; - delete px_button_iconify; px_button_iconify = 0L; - delete px_button_close; px_button_close = 0L; - delete px_button_lower; px_button_lower = 0L; - delete px_button_max; px_button_max = 0L; - delete px_button_unmax; px_button_unmax = 0L; - delete px_title_inactive_left; px_title_inactive_left = 0L; - delete px_title_inactive; px_title_inactive = 0L; - delete px_title_inactive_right; px_title_inactive_right = 0L; - delete px_title_active_left; px_title_active_left = 0L; - delete px_title_active; px_title_active = 0L; - delete px_title_active_right; px_title_active_right = 0L; - delete px_resize_left; px_resize_left = 0L; - delete px_resize_mid; px_resize_mid = 0L; - delete px_resize_right; px_resize_right = 0L; + delete px_button_base_up; px_button_base_up = 0L; + delete px_button_base_down; px_button_base_down = 0L; + delete px_button_base_up_active; px_button_base_up_active = 0L; + delete px_button_base_down_active; px_button_base_down_active = 0L; + delete px_button_iconify; px_button_iconify = 0L; + delete px_button_close; px_button_close = 0L; + delete px_button_lower; px_button_lower = 0L; + delete px_button_max; px_button_max = 0L; + delete px_button_unmax; px_button_unmax = 0L; + delete px_button_iconify_active; px_button_iconify_active = 0L; + delete px_button_close_active; px_button_close_active = 0L; + delete px_button_lower_active; px_button_lower_active = 0L; + delete px_button_max_active; px_button_max_active = 0L; + delete px_button_unmax_active; px_button_unmax_active = 0L; + delete px_title_inactive_left; px_title_inactive_left = 0L; + delete px_title_inactive; px_title_inactive = 0L; + delete px_title_inactive_right; px_title_inactive_right = 0L; + delete px_title_active_left; px_title_active_left = 0L; + delete px_title_active; px_title_active = 0L; + delete px_title_active_right; px_title_active_right = 0L; + delete px_resize_left; px_resize_left = 0L; + delete px_resize_mid; px_resize_mid = 0L; + delete px_resize_right; px_resize_right = 0L; } - px_button_base_up = new QPixmap(button_base_up_xpm); - px_button_base_down = new QPixmap(button_base_down_xpm); - px_button_iconify = new QPixmap(button_iconify_xpm); - px_button_close = new QPixmap(button_close_xpm); - px_button_lower = new QPixmap(button_lower_xpm); - px_button_max = new QPixmap(button_max_xpm); - px_button_unmax = new QPixmap(button_unmax_xpm); - px_title_inactive_left = new QPixmap(title_inactive_left_xpm); - px_title_inactive = new QPixmap(title_inactive_xpm); - px_title_inactive_right = new QPixmap(title_inactive_right_xpm); - px_title_active_left = new QPixmap(title_active_left_xpm); - px_title_active = new QPixmap(title_active_xpm); - px_title_active_right = new QPixmap(title_active_right_xpm); - px_resize_left = new QPixmap(resize_bar_left_xpm); - px_resize_mid = new QPixmap(resize_bar_mid_xpm); - px_resize_right = new QPixmap(resize_bar_right_xpm); + px_button_base_up = new QPixmap(button_base_up_xpm); + px_button_base_down = new QPixmap(button_base_down_xpm); + px_button_base_up_active = new QPixmap(button_base_up_active_xpm); + px_button_base_down_active = new QPixmap(button_base_down_active_xpm); + px_button_iconify = new QPixmap(button_iconify_xpm); + px_button_close = new QPixmap(button_close_xpm); + px_button_lower = new QPixmap(button_lower_xpm); + px_button_max = new QPixmap(button_max_xpm); + px_button_unmax = new QPixmap(button_unmax_xpm); + px_button_iconify_active = new QPixmap(button_iconify_active_xpm); + px_button_close_active = new QPixmap(button_close_active_xpm); + px_button_lower_active = new QPixmap(button_lower_active_xpm); + px_button_max_active = new QPixmap(button_max_active_xpm); + px_button_unmax_active = new QPixmap(button_unmax_active_xpm); + px_title_inactive_left = new QPixmap(title_inactive_left_xpm); + px_title_inactive = new QPixmap(title_inactive_xpm); + px_title_inactive_right = new QPixmap(title_inactive_right_xpm); + px_title_active_left = new QPixmap(title_active_left_xpm); + px_title_active = new QPixmap(title_active_xpm); + px_title_active_right = new QPixmap(title_active_right_xpm); + px_resize_left = new QPixmap(resize_bar_left_xpm); + px_resize_mid = new QPixmap(resize_bar_mid_xpm); + px_resize_right = new QPixmap(resize_bar_right_xpm); pixmapsLoaded_ = true; } diff --git a/clients/riscos/riscosclient.h b/clients/riscos/riscosclient.h index 9df09ab285..0886973ee4 100644 --- a/clients/riscos/riscosclient.h +++ b/clients/riscos/riscosclient.h @@ -34,11 +34,18 @@ namespace RiscOS { static QPixmap * px_button_base_up; static QPixmap * px_button_base_down; +static QPixmap * px_button_base_up_active; +static QPixmap * px_button_base_down_active; static QPixmap * px_button_iconify_; static QPixmap * px_button_close_; static QPixmap * px_button_lower_; static QPixmap * px_button_max_; static QPixmap * px_button_unmax_; +static QPixmap * px_button_iconify_active; +static QPixmap * px_button_close_active; +static QPixmap * px_button_lower_active; +static QPixmap * px_button_max_active; +static QPixmap * px_button_unmax_active; static QPixmap * px_title_inactive_left_; static QPixmap * px_title_inactive_; static QPixmap * px_title_inactive_right_; @@ -61,10 +68,12 @@ class Button : public QButton Button(Manager * parent); + void update(); + protected: void drawButton(QPainter *); - void setSymbol(QPixmap *); + void setSymbols(QPixmap *, QPixmap *); protected: @@ -74,7 +83,8 @@ class Button : public QButton Manager * client_; - QPixmap * px_symbol_; + QPixmap * px_symbol_inactive_; + QPixmap * px_symbol_active_; }; // -------------------------------------------------------------------------- diff --git a/clients/riscos/title_active.xpm b/clients/riscos/title_active.xpm index eeca1b7d33..cfcdba5539 100644 --- a/clients/riscos/title_active.xpm +++ b/clients/riscos/title_active.xpm @@ -2,26 +2,26 @@ static char * title_active_xpm[] = { "128 18 6 1", " c None", -". c #FFFFFF", -"+ c #DCDCDC", -"@ c #C3C3C3", -"# c #A0A0A0", +". c #DCDCDC", +"+ c #808080", +"@ c #000000", +"# c #303030", "$ c #585858", "................................................................................................................................", "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", +"################################################################################################################################", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", "################################################################################################################################", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"}; +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"################################################################################################################################", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"################################################################################################################################", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", +"################################################################################################################################"}; diff --git a/clients/riscos/title_active_left.xpm b/clients/riscos/title_active_left.xpm index 14f4a8e4a8..2755a4a5ee 100644 --- a/clients/riscos/title_active_left.xpm +++ b/clients/riscos/title_active_left.xpm @@ -1,26 +1,27 @@ /* XPM */ static char * title_active_left_xpm[] = { -"2 18 5 1", +"2 18 6 1", " c None", ". c #FFFFFF", "+ c #DCDCDC", "@ c #C3C3C3", -"# c #A0A0A0", -"..", +"# c #808080", +"$ c #585858", ".+", -".+", -".+", -".+", -".+", -".+", -".+", -".+", -".+", -".+", -".+", -".+", -".+", -".+", -".+", -".@", -"+#"}; +"+@", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"+#", +"@$"}; diff --git a/clients/riscos/title_active_right.xpm b/clients/riscos/title_active_right.xpm index b348672263..9e6c4c6da5 100644 --- a/clients/riscos/title_active_right.xpm +++ b/clients/riscos/title_active_right.xpm @@ -1,29 +1,28 @@ /* XPM */ static char * title_active_right_xpm[] = { -"2 18 8 1", +"2 18 7 1", " c None", -". c #FFFFFF", -"+ c #DCDCDC", -"@ c #C3C3C3", -"# c #808080", -"$ c #A0A0A0", -"% c #585858", -"& c #303030", +". c #DCDCDC", +"+ c #C3C3C3", +"@ c #808080", +"# c #585858", +"$ c #303030", +"% c #000000", ".+", "@#", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"$%", -"%&"}; +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"#$", +"$%"};