Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Some tweaking of ColorPaletteDialog.

Browse Source
This commit is contained in:
Jim Evins
2015-08-18 20:58:55 -04:00
parent a2504036e8
commit c90c2f8236
9 changed files with 309 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ColorHistory.cpp
+6 -4
View File
@@ -50,7 +50,7 @@ namespace glabels
QColor newColors[MAX_COLORS];
int n;
readColorArray( oldColors, n );
readColorArray( oldColors, &n );
int i;
newColors[0] = color;
@@ -69,6 +69,8 @@ namespace glabels
QColor colors[MAX_COLORS];
int n;
readColorArray( colors, &n );
if ( (n > 0) && (i < n) )
{
return colors[i];
@@ -80,15 +82,15 @@ namespace glabels
}
void ColorHistory::readColorArray( QColor array[MAX_COLORS], int& n )
void ColorHistory::readColorArray( QColor array[MAX_COLORS], int* n )
{
QSettings settings;
settings.beginGroup( "ColorHistory" );
settings.beginReadArray( "history" );
n = settings.value( "history/size", 0 ).toInt();
for ( int i = 0; i < n; i++ )
*n = settings.value( "history/size", 0 ).toInt();
for ( int i = 0; i < *n; i++ )
{
settings.setArrayIndex(i);
array[i] = settings.value( "color" ).value<QColor>();