Display fix for Color menu picker window title. Filter out & accelerator characters.
This commit is contained in:
parent
fcf250e350
commit
fdb58db949
|
@ -134,7 +134,12 @@ void ColorMenuItem::openColorPicker(void)
|
||||||
//printf("Open Color Picker\n");
|
//printf("Open Color Picker\n");
|
||||||
if ( picker == NULL )
|
if ( picker == NULL )
|
||||||
{
|
{
|
||||||
picker = new ColorMenuPickerDialog_t( colorPtr, title.toStdString().c_str(), parentWidget() );
|
QString qs;
|
||||||
|
|
||||||
|
qs = title;
|
||||||
|
qs.replace( "&", "", Qt::CaseInsensitive); // get rid of & accelerator characters
|
||||||
|
|
||||||
|
picker = new ColorMenuPickerDialog_t( colorPtr, qs.toStdString().c_str(), parentWidget() );
|
||||||
|
|
||||||
picker->show();
|
picker->show();
|
||||||
|
|
||||||
|
@ -148,7 +153,7 @@ void ColorMenuItem::openColorPicker(void)
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
//------ Color Menu Picker
|
//------ Color Menu Picker
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
ColorMenuPickerDialog_t::ColorMenuPickerDialog_t( QColor *c, const char *txt, QWidget *parent )
|
ColorMenuPickerDialog_t::ColorMenuPickerDialog_t( QColor *c, const char *titleText, QWidget *parent )
|
||||||
: QDialog( parent )
|
: QDialog( parent )
|
||||||
{
|
{
|
||||||
QVBoxLayout *mainLayout;
|
QVBoxLayout *mainLayout;
|
||||||
|
@ -161,7 +166,7 @@ ColorMenuPickerDialog_t::ColorMenuPickerDialog_t( QColor *c, const char *txt, QW
|
||||||
|
|
||||||
style = this->style();
|
style = this->style();
|
||||||
|
|
||||||
sprintf( stmp, "Pick Color for %s", txt);
|
sprintf( stmp, "Pick Color for %s", titleText);
|
||||||
|
|
||||||
setWindowTitle( stmp );
|
setWindowTitle( stmp );
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ class ColorMenuPickerDialog_t : public QDialog
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ColorMenuPickerDialog_t( QColor *c, const char *txt, QWidget *parent = 0);
|
ColorMenuPickerDialog_t( QColor *c, const char *titleText, QWidget *parent = 0);
|
||||||
~ColorMenuPickerDialog_t(void);
|
~ColorMenuPickerDialog_t(void);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
Loading…
Reference in New Issue