Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 9596 → Rev 9597

/branches/Version135x/Scribus/scribus/cpalette.cpp
132,7 → 132,6
colorListQLBox->setMinimumSize( QSize( 150, 30 ) );
colorListQLBox->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
Form1Layout->addWidget(colorListQLBox);
// dynTip = new DynamicTip(colorListQLBox, &colorList);
 
patternFrame = new Q3Frame( this, "frame3" );
patternFrame->setFrameShape( Q3Frame::NoFrame );
/branches/Version135x/Scribus/scribus/cpalette.h
56,7 → 56,6
class QLabel;
class QSpacerItem;
class QSpinBox;
// class DynamicTip;
class ColorListBox;
class ScrSpinBox;
class ScComboBox;
140,7 → 139,6
QPixmap rgbIcon;
QPixmap spotIcon;
QPixmap regIcon;
// DynamicTip* dynTip;
 
ColorListBox *colorListQLBox;
Q3Frame* patternFrame;
/branches/Version135x/Scribus/scribus/colorlistbox.cpp
194,6 → 194,7
{
if (cList->contains(it->text()))
{
event->accept();
QString tipText = "";
ScColor col = (*cList)[it->text()];
if (col.getColorModel() == colorModelCMYK)
209,12 → 210,9
tipText = QString("R:%1 G:%2 B:%3").arg(r).arg(g).arg(b);
}
QToolTip::showText(helpEvent->globalPos(), tipText);
return true;
}
else
QToolTip::showText(helpEvent->globalPos(), "");
}
else
QToolTip::showText(helpEvent->globalPos(), "");
}
}
return Q3ListBox::event(event);
/branches/Version135x/Scribus/scribus/colorm.cpp
145,7 → 145,6
Layout2->addLayout( layout5 );
replaceMap.clear();
EditColors = doco;
// dynTip = new DynamicTip(colorListBox, &EditColors);
updateCList();
// signals and slots connections
if (m_Doc==0)
166,7 → 165,7
QToolTip::add( duplicateColorButton, "<qt>" + tr( "Make a copy of the currently selected color" ) + "</qt>");
QToolTip::add( deleteColorButton, "<qt>" + tr( "Delete the currently selected color" ) + "</qt>");
QToolTip::add( saveButton, "<qt>" + tr( "Make the current colorset the default color set" ) + "</qt>");
QToolTip::add( colorListBox, "<qt>" + tr( "If color management is enabled, a triangle warning indicator is a warning the the color maybe outside of the color gamut of the current printer profile selected.What this means is the color may not print exactly as indicated on screen. Spot colors are indicated by a red circle. Registration colors will have a registration mark next to the color. More hints about gamut warnings are in the online help under Color Management." ) + "</qt>");
QToolTip::add( colorListBox, "<qt>" + tr( "If color management is enabled, a triangle warning indicator is a warning the the color maybe outside of the color gamut of the current printer profile selected.What this means is the color may not print exactly as indicated on screen. Spot colors are indicated by a red circle. Registration colors will have a registration mark next to the color. More hints about gamut warnings are in the online help under Color Management." ) + "</qt>");
connect( saveButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( cancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( newColorButton, SIGNAL( clicked() ), this, SLOT( newColor() ) );
672,6 → 671,7
ColorList::Iterator it;
ScribusDoc* doc = EditColors.document();
colorListBox->clear();
colorListBox->cList = &EditColors;
for (it = EditColors.begin(); it != EditColors.end(); ++it)
{
if (it.key() == CommonStrings::None || it.key() == CommonStrings::tr_NoneColor)
/branches/Version135x/Scribus/scribus/colorm.h
26,7 → 26,6
#include "scribusstructs.h"
#include "query.h"
 
// class DynamicTip;
class ScribusDoc;
class ColorListBox;
 
73,7 → 72,6
QString sColor;
QColor tmpColor;
QStringList DontChange;
// DynamicTip* dynTip;
ScribusDoc* m_Doc;
 
private slots: