Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 123 → Rev 122

/trunk/Scribus/ChangeLogCVS
1,8 → 1,4
Changes since Version 1.1.3
10.12.2003 Fixed Preferences Issues.
Combined the Toolbar Buttons for Rectangles and Circles into one Button
containing all Autoforms.
 
09.12.2003 Added some new Shapes to the Autoforms Menue.
Fixed the disabled Keyboard Bug.
 
/trunk/Scribus/scribus/mpalette.cpp
873,7 → 873,7
connect(RotationGroup, SIGNAL(clicked(int)), this, SLOT(NewRotMode(int)));
connect(Textflow, SIGNAL(clicked()), this, SLOT(DoFlow()));
connect(Textflow2, SIGNAL(clicked()), this, SLOT(DoFlow2()));
connect(SCustom, SIGNAL(FormSel(int, int, double *)), this, SLOT(MakeIrre(int, int, double *)));
connect(SCustom, SIGNAL(FormSel(int)), this, SLOT(MakeIrre(int)));
connect(EditShape, SIGNAL(clicked()), this, SLOT(EditSh()));
connect(DTop, SIGNAL(valueChanged(int)), this, SLOT(NewTDist()));
connect(DLeft, SIGNAL(valueChanged(int)), this, SLOT(NewTDist()));
2154,7 → 2154,7
}
}
 
void Mpalette::MakeIrre(int f, int c, double *vals)
void Mpalette::MakeIrre(int f)
{
if ((HaveDoc) && (HaveItem))
{
2168,8 → 2168,254
case 1:
doc->ActPage->SetOvalFrame(CurItem);
break;
case 2:
{
double rect[] = { 0.0, 0.0, 0.0, 0.0,
100.0, 100.0, 100.0, 100.0,
100.0, 100.0, 100.0, 100.0,
0.0, 100.0, 0.0, 100.0,
0.0, 100.0, 0.0, 100.0,
0.0, 0.0, 0.0, 0.0};
doc->ActPage->SetFrameShape(CurItem, 24, rect);
break;
}
case 3:
{
double rect[] = { 0.0, 25.0, 0.0, 25.0,
25.0, 25.0, 25.0, 25.0,
25.0, 25.0, 25.0, 25.0,
25.0, 0.0, 25.0, 0.0,
25.0, 0.0, 25.0, 0.0,
75.0, 0.0, 75.0, 0.0,
75.0, 0.0, 75.0, 0.0,
75.0, 25.0, 75.0, 25.0,
75.0, 25.0, 75.0, 25.0,
100.0, 25.0, 100.0, 25.0,
100.0, 25.0, 100.0, 25.0,
100.0, 75.0, 100.0, 75.0,
100.0, 75.0, 100.0, 75.0,
75.0, 75.0, 75.0, 75.0,
75.0, 75.0, 75.0, 75.0,
75.0, 100.0, 75.0, 100.0,
75.0, 100.0, 75.0, 100.0,
25.0, 100.0, 25.0, 100.0,
25.0, 100.0, 25.0, 100.0,
25.0, 75.0, 25.0, 75.0,
25.0, 75.0, 25.0, 75.0,
0.0, 75.0, 0.0, 75.0,
0.0, 75.0, 0.0, 75.0,
0.0, 25.0, 0.0, 25.0};
doc->ActPage->SetFrameShape(CurItem, 96, rect);
break;
}
case 4:
{
double rect[] = { 0.0, 50.0, 0.0, 50.0,
50.0, 0.0, 50.0, 0.0,
50.0, 0.0, 50.0, 0.0,
50.0, 25.0, 50.0, 25.0,
50.0, 25.0, 50.0, 25.0,
100.0, 25.0, 100.0, 25.0,
100.0, 25.0, 100.0, 25.0,
100.0, 75.0, 100.0, 75.0,
100.0, 75.0, 100.0, 75.0,
50.0, 75.0, 50.0, 75.0,
50.0, 75.0, 50.0, 75.0,
50.0, 100.0, 50.0, 100.0,
50.0, 100.0, 50.0, 100.0,
0.0, 50.0, 0.0, 50.0};
doc->ActPage->SetFrameShape(CurItem, 56, rect);
break;
}
case 5:
{
double rect[] = { 0.0, 25.0, 0.0, 25.0,
50.0, 25.0, 50.0, 25.0,
50.0, 25.0, 50.0, 25.0,
50.0, 0.0, 50.0, 0.0,
50.0, 0.0, 50.0, 0.0,
100.0, 50.0, 100.0, 50.0,
100.0, 50.0, 100.0, 50.0,
50.0, 100.0, 50.0, 100.0,
50.0, 100.0, 50.0, 100.0,
50.0, 75.0, 50.0, 75.0,
50.0, 75.0, 50.0, 75.0,
0.0, 75.0, 0.0, 75.0,
0.0, 75.0, 0.0, 75.0,
0.0, 25.0, 0.0, 25.0};
doc->ActPage->SetFrameShape(CurItem, 56, rect);
break;
}
case 6:
{
double rect[] = { 0.0, 50.0, 0.0, 50.0,
50.0, 0.0, 50.0, 0.0,
50.0, 0.0, 50.0, 0.0,
100.0, 50.0, 100.0, 50.0,
100.0, 50.0, 100.0, 50.0,
75.0, 50.0, 75.0, 50.0,
75.0, 50.0, 75.0, 50.0,
75.0, 100.0, 75.0, 100.0,
75.0, 100.0, 75.0, 100.0,
25.0, 100.0, 25.0, 100.0,
25.0, 100.0, 25.0, 100.0,
25.0, 50.0, 25.0, 50.0,
25.0, 50.0, 25.0, 50.0,
0.0, 50.0, 0.0, 50.0};
doc->ActPage->SetFrameShape(CurItem, 56, rect);
break;
}
case 7:
{
double rect[] = { 0.0, 50.0, 0.0, 50.0,
25.0, 50.0, 25.0, 50.0,
25.0, 50.0, 25.0, 50.0,
25.0, 0.0, 25.0, 0.0,
25.0, 0.0, 25.0, 0.0,
75.0, 0.0, 75.0, 0.0,
75.0, 0.0, 75.0, 0.0,
75.0, 50.0, 75.0, 50.0,
75.0, 50.0, 75.0, 50.0,
100.0, 50.0, 100.0, 50.0,
100.0, 50.0, 100.0, 50.0,
50.0, 100.0, 50.0, 100.0,
50.0, 100.0, 50.0, 100.0,
0.0, 50.0, 0.0, 50.0};
doc->ActPage->SetFrameShape(CurItem, 56, rect);
break;
}
case 8:
{
double rect[] = { 0.0, 50.0, 0.0, 22.385765,
100.0, 0.0, 44.77716, 0.0,
100.0, 0.0, 100.0, 0.0,
100.0, 100.0, 100.0, 100.0,
100.0, 100.0, 44.77716, 100.0,
0.0, 50.0, 0.0, 77.615235};
doc->ActPage->SetFrameShape(CurItem, 24, rect);
break;
}
case 9:
{
double rect[] = { 100.0, 50.0, 100.0, 77.615235,
0.0, 100.0, 55.22284, 100.0,
0.0, 100.0, 0.0, 100.0,
0.0, 0.0, 0.0, 0.0,
0.0, 0.0, 55.22281, 0.0,
100.0, 50.0, 100.0, 22.385765};
doc->ActPage->SetFrameShape(CurItem, 24, rect);
break;
}
case 10:
{
double rect[] = { 100.0, 100.0, 100.0, 100.0,
0.0, 100.0, 0.0, 100.0,
0.0, 100.0, 0.0, 44.7715,
50.0, 0.0, 22.3858, 0.0,
50.0, 0.0, 77.6152, 0.0,
100.0, 100.0, 100.0, 44.7715};
doc->ActPage->SetFrameShape(CurItem, 24, rect);
break;
}
case 11:
{
double rect[] = { 100.0, 0.0, 100.0, 0.0,
0.0, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 55.2285,
50.0, 100.0, 22.3858, 100.0,
50.0, 100.0, 77.6152, 100.0,
100.0, 0.0, 100.0, 55.2285};
doc->ActPage->SetFrameShape(CurItem, 24, rect);
break;
}
case 12:
{
double rect[] = { 0.0, 50.0, 0.0, 50.0,
100.0, 0.0, 100.0, 0.0,
100.0, 0.0, 100.0, 0.0,
100.0, 100.0, 100.0, 100.0,
100.0, 100.0, 100.0, 100.0,
0.0, 50.0, 0.0, 50.0};
doc->ActPage->SetFrameShape(CurItem, 24, rect);
break;
}
case 13:
{
double rect[] = { 0.0, 0.0, 0.0, 0.0,
100.0, 50.0, 100.0, 50.0,
100.0, 50.0, 100.0, 50.0,
0.0, 100.0, 0.0, 100.0,
0.0, 100.0, 0.0, 100.0,
0.0, 0.0, 0.0, 0.0};
doc->ActPage->SetFrameShape(CurItem, 24, rect);
break;
}
case 14:
{
double rect[] = { 0.0, 100.0, 0.0, 100.0,
50.0, 0.0, 50.0, 0.0,
50.0, 0.0, 50.0, 0.0,
100.0, 100.0, 100.0, 100.0,
100.0, 100.0, 100.0, 100.0,
0.0, 100.0, 0.0, 100.0};
doc->ActPage->SetFrameShape(CurItem, 24, rect);
break;
}
case 15:
{
double rect[] = { 0.0, 0.0, 0.0, 0.0,
100.0, 0.0, 100.0, 0.0,
100.0, 0.0, 100.0, 0.0,
50.0, 100.0, 50.0, 100.0,
50.0, 100.0, 50.0, 100.0,
0.0, 0.0, 0.0, 0.0};
doc->ActPage->SetFrameShape(CurItem, 24, rect);
break;
}
case 16:
{
double rect[] = { 25.0, 0.0, 25.0, 0.0,
75.0, 0.0, 75.0, 0.0,
75.0, 0.0, 75.0, 13.8071,
100.0, 25.0, 86.1929, 25.0,
100.0, 25.0, 100.0, 25.0,
100.0, 75.0, 100.0, 75.0,
100.0, 75.0, 86.1929, 75.0,
75.0, 100.0, 75.0, 86.1929,
75.0, 100.0, 75.0, 100.0,
25.0, 100.0, 25.0, 100.0,
25.0, 100.0, 25.0, 86.1929,
0.0, 75.0, 13.8071, 75.0,
0.0, 75.0, 0.0, 75.0,
0.0, 25.0, 0.0, 25.0,
0.0, 25.0, 13.8071, 25.0,
25.0, 0.0, 25.0, 13.8071};
doc->ActPage->SetFrameShape(CurItem, 64, rect);
break;
}
case 17:
{
double rect[] = { 100.0, 50.0, 100.0, 77.6152,
50.0, 100.0, 77.6152, 100.0,
50.0, 100.0, 22.3858, 100.0,
0.0, 50.0, 0.0, 77.6152,
0.0, 50.0, 0.0, 22.3858,
50.0, 0.0, 22.3858, 0.0,
50.0, 0.0, 77.6152, 0.0,
100.0, 50.0, 100.0, 22.3858,
-1.0, -1.0, -1.0, -1.0,
75.0, 50.0, 75.0, 63.8076,
50.0, 75.0, 63.8076, 75.0,
50.0, 75.0, 36.1929, 75.0,
25.0, 50.0, 25.0, 63.8076,
25.0, 50.0, 25.0, 36.1929,
50.0, 25.0, 36.1929, 25.0,
50.0, 25.0, 63.8076, 25.0,
75.0, 50.0, 75.0, 36.1929};
doc->ActPage->SetFrameShape(CurItem, 68, rect);
break;
}
default:
doc->ActPage->SetFrameShape(CurItem, c, vals);
break;
}
doc->ActPage->RefreshItem(CurItem);
2187,11 → 2433,7
if ((HaveDoc) && (HaveItem))
{
if ((CurItem->PType == 1) || (CurItem->PType == 3))
{
CurItem->PType = 6;
NewSel(6);
TabStack->raiseWidget(1);
}
MakeIrre(0);
emit EditCL();
emit DocChanged();
}
/trunk/Scribus/scribus/autoform.cpp
108,128 → 108,8
 
void Autoforms::selForm(int a)
{
static double AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0,
0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
static double AutoShapes1[] = {100.0, 50.0, 100.0, 77.615235, 50.0, 100.0, 77.615235, 100.0, 50.0, 100.0, 22.385765, 100.0,
0.0, 50.0, 0.0, 77.615235, 0.0, 50.0, 0.0, 22.385765, 50.0, 0.0, 22.385765, 0.0,
50.0, 0.0, 77.615235, 0.0, 100.0, 50.0, 100.0, 22.385765};
static double AutoShapes2[] = {0.0, 0.0, 0.0, 0.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0,
0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
static double AutoShapes3[] = {0.0, 25.0, 0.0, 25.0, 25.0, 25.0, 25.0, 25.0, 25.0, 25.0, 25.0, 25.0,
25.0, 0.0, 25.0, 0.0, 25.0, 0.0, 25.0, 0.0, 75.0, 0.0, 75.0, 0.0,
75.0, 0.0, 75.0, 0.0, 75.0, 25.0, 75.0, 25.0, 75.0, 25.0, 75.0, 25.0,
100.0, 25.0, 100.0, 25.0, 100.0, 25.0, 100.0, 25.0, 100.0, 75.0, 100.0, 75.0,
100.0, 75.0, 100.0, 75.0, 75.0, 75.0, 75.0, 75.0, 75.0, 75.0, 75.0, 75.0,
75.0, 100.0, 75.0, 100.0, 75.0, 100.0, 75.0, 100.0, 25.0, 100.0, 25.0, 100.0,
25.0, 100.0, 25.0, 100.0, 25.0, 75.0, 25.0, 75.0, 25.0, 75.0, 25.0, 75.0,
0.0, 75.0, 0.0, 75.0, 0.0, 75.0, 0.0, 75.0, 0.0, 25.0, 0.0, 25.0};
static double AutoShapes4[] = {0.0, 50.0, 0.0, 50.0, 50.0, 0.0, 50.0, 0.0, 50.0, 0.0, 50.0, 0.0,
50.0, 25.0, 50.0, 25.0, 50.0, 25.0, 50.0, 25.0, 100.0, 25.0, 100.0, 25.0,
100.0, 25.0, 100.0, 25.0, 100.0, 75.0, 100.0, 75.0, 100.0, 75.0, 100.0, 75.0,
50.0, 75.0, 50.0, 75.0, 50.0, 75.0, 50.0, 75.0, 50.0, 100.0, 50.0, 100.0,
50.0, 100.0, 50.0, 100.0, 0.0, 50.0, 0.0, 50.0};
static double AutoShapes5[] = {0.0, 25.0, 0.0, 25.0, 50.0, 25.0, 50.0, 25.0, 50.0, 25.0, 50.0, 25.0,
50.0, 0.0, 50.0, 0.0, 50.0, 0.0, 50.0, 0.0, 100.0, 50.0, 100.0, 50.0,
100.0, 50.0, 100.0, 50.0, 50.0, 100.0, 50.0, 100.0, 50.0, 100.0, 50.0, 100.0,
50.0, 75.0, 50.0, 75.0, 50.0, 75.0, 50.0, 75.0, 0.0, 75.0, 0.0, 75.0,
0.0, 75.0, 0.0, 75.0, 0.0, 25.0, 0.0, 25.0};
static double AutoShapes6[] = {0.0, 50.0, 0.0, 50.0, 50.0, 0.0, 50.0, 0.0, 50.0, 0.0, 50.0, 0.0,
100.0, 50.0, 100.0, 50.0, 100.0, 50.0, 100.0, 50.0, 75.0, 50.0, 75.0, 50.0,
75.0, 50.0, 75.0, 50.0, 75.0, 100.0, 75.0, 100.0, 75.0, 100.0, 75.0, 100.0,
25.0, 100.0, 25.0, 100.0, 25.0, 100.0, 25.0, 100.0, 25.0, 50.0, 25.0, 50.0,
25.0, 50.0, 25.0, 50.0, 0.0, 50.0, 0.0, 50.0};
static double AutoShapes7[] = {0.0, 50.0, 0.0, 50.0, 25.0, 50.0, 25.0, 50.0, 25.0, 50.0, 25.0, 50.0,
25.0, 0.0, 25.0, 0.0, 25.0, 0.0, 25.0, 0.0, 75.0, 0.0, 75.0, 0.0,
75.0, 0.0, 75.0, 0.0, 75.0, 50.0, 75.0, 50.0, 75.0, 50.0, 75.0, 50.0,
100.0, 50.0, 100.0, 50.0, 100.0, 50.0, 100.0, 50.0, 50.0, 100.0, 50.0, 100.0,
50.0, 100.0, 50.0, 100.0, 0.0, 50.0, 0.0, 50.0};
static double AutoShapes8[] = {0.0, 50.0, 0.0, 22.385765, 100.0, 0.0, 44.77716, 0.0, 100.0, 0.0, 100.0, 0.0,
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 44.77716, 100.0, 0.0, 50.0, 0.0, 77.615235};
static double AutoShapes9[] = {100.0, 50.0, 100.0, 77.615235, 0.0, 100.0, 55.22284, 100.0, 0.0, 100.0, 0.0, 100.0,
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.22281, 0.0, 100.0, 50.0, 100.0, 22.385765};
static double AutoShapes10[] = {100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 44.7715,
50.0, 0.0, 22.3858, 0.0, 50.0, 0.0, 77.6152, 0.0, 100.0, 100.0, 100.0, 44.7715};
static double AutoShapes11[] = {100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.2285, 50.0, 100.0,
22.3858, 100.0, 50.0, 100.0, 77.6152, 100.0, 100.0, 0.0, 100.0, 55.2285};
static double AutoShapes12[] = {0.0, 50.0, 0.0, 50.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 0.0, 50.0, 0.0, 50.0};
static double AutoShapes13[] = {0.0, 0.0, 0.0, 0.0, 100.0, 50.0, 100.0, 50.0, 100.0, 50.0, 100.0, 50.0,
0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
static double AutoShapes14[] = {0.0, 100.0, 0.0, 100.0, 50.0, 0.0, 50.0, 0.0, 50.0, 0.0, 50.0, 0.0,
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0};
static double AutoShapes15[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
50.0, 100.0, 50.0, 100.0, 50.0, 100.0, 50.0, 100.0, 0.0, 0.0, 0.0, 0.0};
static double AutoShapes16[] = {25.0, 0.0, 25.0, 0.0, 75.0, 0.0, 75.0, 0.0, 75.0, 0.0, 75.0, 13.8071,
100.0, 25.0, 86.1929, 25.0, 100.0, 25.0, 100.0, 25.0, 100.0, 75.0, 100.0, 75.0,
100.0, 75.0, 86.1929, 75.0, 75.0, 100.0, 75.0, 86.1929, 75.0, 100.0, 75.0, 100.0,
25.0, 100.0, 25.0, 100.0, 25.0, 100.0, 25.0, 86.1929, 0.0, 75.0, 13.8071, 75.0,
0.0, 75.0, 0.0, 75.0, 0.0, 25.0, 0.0, 25.0, 0.0, 25.0, 13.8071, 25.0,
25.0, 0.0, 25.0, 13.8071};
static double AutoShapes17[] = {100.0, 50.0, 100.0, 77.6152, 50.0, 100.0, 77.6152, 100.0, 50.0, 100.0, 22.3858, 100.0,
0.0, 50.0, 0.0, 77.6152, 0.0, 50.0, 0.0, 22.3858, 50.0, 0.0, 22.3858, 0.0,
50.0, 0.0, 77.6152, 0.0, 100.0, 50.0, 100.0, 22.3858, -1.0, -1.0, -1.0, -1.0,
75.0, 50.0, 75.0, 63.8076, 50.0, 75.0, 63.8076, 75.0, 50.0, 75.0, 36.1929, 75.0,
25.0, 50.0, 25.0, 63.8076, 25.0, 50.0, 25.0, 36.1929, 50.0, 25.0, 36.1929, 25.0,
50.0, 25.0, 63.8076, 25.0, 75.0, 50.0, 75.0, 36.1929};
Men->activateItemAt(0);
const QPixmap *px = buttonGroup1->find(a)->pixmap();
setPixmap(*px);
switch (a)
{
case 0:
emit FormSel(a, 32, AutoShapes0);
break;
case 1:
emit FormSel(a, 32, AutoShapes1);
break;
case 2:
emit FormSel(a, 24, AutoShapes2);
break;
case 3:
emit FormSel(a, 96, AutoShapes3);
break;
case 4:
emit FormSel(a, 56, AutoShapes4);
break;
case 5:
emit FormSel(a, 56, AutoShapes5);
break;
case 6:
emit FormSel(a, 56, AutoShapes6);
break;
case 7:
emit FormSel(a, 56, AutoShapes7);
break;
case 8:
emit FormSel(a, 24, AutoShapes8);
break;
case 9:
emit FormSel(a, 24, AutoShapes9);
break;
case 10:
emit FormSel(a, 24, AutoShapes10);
break;
case 11:
emit FormSel(a, 24, AutoShapes11);
break;
case 12:
emit FormSel(a, 24, AutoShapes12);
break;
case 13:
emit FormSel(a, 24, AutoShapes13);
break;
case 14:
emit FormSel(a, 24, AutoShapes14);
break;
case 15:
emit FormSel(a, 24, AutoShapes15);
break;
case 16:
emit FormSel(a, 64, AutoShapes16);
break;
case 17:
emit FormSel(a, 68, AutoShapes17);
break;
}
emit FormSel(a);
}
/trunk/Scribus/scribus/libabout/about.cpp
33,7 → 33,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(10).arg("December").arg(2003);
QString bu = tr("%1. %2 %3 ").arg(9).arg("December").arg(2003);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
71,7 → 71,6
#include "lineformats.h"
#include "missing.h"
#include "story.h"
#include "autoform.h"
extern QPixmap loadIcon(QString nam);
extern bool overwrite(QWidget *parent, QString filename);
 
2395,6 → 2394,7
#endif
if(!ss->ReadDoc(fileName, Prefs.AvailFonts, doc, view, FProg))
{
// w->close();
view->close();
disconnect(ss, SIGNAL(NewPage(int)), this, SLOT(slotNewPage(int)));
delete ss;
3799,6 → 3799,7
WerkTools->Texte->setEnabled(false);
WerkTools->BildB->setEnabled(false);
WerkTools->Rechteck->setEnabled(false);
WerkTools->Kreis->setEnabled(false);
WerkTools->Linien->setEnabled(false);
WerkTools->Polygon->setEnabled(false);
WerkTools->PolyLin->setEnabled(false);
3827,6 → 3828,7
WerkTools->Texte->setEnabled(true);
WerkTools->BildB->setEnabled(true);
WerkTools->Rechteck->setEnabled(true);
WerkTools->Kreis->setEnabled(true);
WerkTools->Linien->setEnabled(true);
WerkTools->Polygon->setEnabled(true);
WerkTools->PolyLin->setEnabled(true);
3857,6 → 3859,7
WerkTools->Texte->setOn(false);
WerkTools->BildB->setOn(false);
WerkTools->Rechteck->setOn(false);
WerkTools->Kreis->setOn(false);
WerkTools->Linien->setOn(false);
WerkTools->Polygon->setOn(false);
WerkTools->PolyLin->setOn(false);
3966,14 → 3969,6
qApp->setOverrideCursor(QCursor(loadIcon("LupeZ.xpm")), true);
else
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
if (mode == 2)
{
doc->SubMode = WerkTools->SubMode;
doc->ShapeValues = WerkTools->ShapeVals;
doc->ValCount = WerkTools->ValCount;
}
else
doc->SubMode = -1;
}
}
 
5085,7 → 5080,6
Mpal->Cpal->UseTrans(Prefs.PDFTransparency);
if (HaveDoc)
{
slotChangeUnit(dia->UnitCombo->currentItem(), false);
if (zChange)
slotZoomAbs(doc->Scale*Prefs.DisScale);
doc->GrabRad = dia->SpinBox3_2->value();
5169,6 → 5163,7
doc->ScaleType = dia->FreeScale->isChecked();
doc->AspectRatio = dia->Aspect->isChecked();
doc->Before = dia->RadioButton6->isChecked();
slotChangeUnit(dia->UnitCombo->currentItem(), false);
doc->PagesSbS = dia->SidebySide->isChecked();
doc->ShFrames = dia->FramesVisible->isChecked();
doc->RandFarbig = dia->RandFarb->isChecked();
5184,22 → 5179,6
}
else
{
Prefs.Einheit = dia->UnitCombo->currentItem();
switch (Prefs.Einheit)
{
case 0:
UmReFaktor = 1.0;
break;
case 1:
UmReFaktor = 1.0 / 72.0 * 25.4;
break;
case 2:
UmReFaktor = 1.0 / 72.0;
break;
case 3:
UmReFaktor = 1.0 / 12.0;
break;
}
Prefs.GrabRad = dia->SpinBox3_2->value();
Prefs.GuideRad = dia->SpinBox2g->value() / UmReFaktor / 100;
Prefs.DefFont = dia->FontComb->currentText();
5281,6 → 5260,22
Prefs.ScaleType = dia->FreeScale->isChecked();
Prefs.AspectRatio = dia->Aspect->isChecked();
Prefs.Before = dia->RadioButton6->isChecked();
Prefs.Einheit = dia->UnitCombo->currentItem();
switch (Prefs.Einheit)
{
case 0:
UmReFaktor = 1.0;
break;
case 1:
UmReFaktor = 1.0 / 72.0 * 25.4;
break;
case 2:
UmReFaktor = 1.0 / 72.0;
break;
case 3:
UmReFaktor = 1.0 / 12.0;
break;
}
Prefs.PagesSbS = dia->SidebySide->isChecked();
Prefs.ShFrames = dia->FramesVisible->isChecked();
Prefs.RandFarbig = dia->RandFarb->isChecked();
6004,6 → 5999,7
{
int a = helpMenu->indexOf(id);
if (a > 4)
// if (a > 5)
CallDLL(helpMenu->text(id));
}
 
6497,6 → 6493,7
doc->ActPage->Deselect(true);
b = doc->UnData.Item;
b->Select = false;
// view->Pages.at(doc->UnData.PageNr)->SelItem.clear();
view->Pages.at(doc->UnData.PageNr)->Deselect(true);
switch (doc->UnData.UnCode)
{
/trunk/Scribus/scribus/page.cpp
977,23 → 977,6
}
else
{
if (doku->SubMode != -1)
{
switch (doku->SubMode)
{
case 0:
SetRectFrame(b);
break;
case 1:
SetOvalFrame(b);
break;
default:
SetFrameShape(b, doku->ValCount, doku->ShapeValues);
break;
}
b->OldB2 = b->Width;
b->OldH2 = b->Height;
}
if ((b->OldB2 == 0) || (b->OldH2 == 0))
return;
double scx = b->Width / b->OldB2;
2451,7 → 2434,6
Imoved = false;
mCG = false;
MidButt = false;
doku->SubMode = -1;
}
 
void Page::SetYGuide(QMouseEvent *m)
3240,6 → 3222,7
QRect tx, mpo;
sc = doku->Scale;
Mpressed = true;
// MidButt = false;
Imoved = false;
SeRx = m->x();
SeRy = m->y();
3276,6 → 3259,8
Transform(b, &p);
npf2 = FPoint(p.xFormDev(m->pos()));
ClRe = -1;
// if (m->state() != ShiftButton)
// SelNode.clear();
for (a=0; a<Clip.size(); ++a)
{
if ((EdPoints) && (a % 2 != 0))
3562,25 → 3547,17
case 2:
SeleItem(m);
Deselect(false);
switch (doku->SubMode)
{
case 0:
z = PaintRect(Rxp, Ryp, 1+Rxpd, 1+Rypd, doku->Dwidth, doku->Dbrush, doku->Dpen);
SetupDraw(z);
emit HaveSel(3);
break;
case 1:
z = PaintEllipse(Rxp, Ryp, 1+Rxpd, 1+Rypd, doku->Dwidth, doku->Dbrush, doku->Dpen);
SetupDraw(z);
emit HaveSel(1);
break;
default:
z = PaintPoly(Rxp, Ryp, 1+Rxpd, 1+Rypd, doku->Dwidth, doku->Dbrush, doku->Dpen);
SetupDraw(z);
emit HaveSel(6);
break;
}
z = PaintRect(Rxp, Ryp, 1+Rxpd, 1+Rypd, doku->Dwidth, doku->Dbrush, doku->Dpen);
SetupDraw(z);
emit HaveSel(3);
break;
case 3:
SeleItem(m);
Deselect(false);
z = PaintEllipse(Rxp, Ryp, 1+Rxpd, 1+Rypd, doku->Dwidth, doku->Dbrush, doku->Dpen);
SetupDraw(z);
emit HaveSel(1);
break;
case 4:
SeleItem(m);
Deselect(false);
3622,6 → 3599,7
}
}
inText = slotSetCurs(m->x(), m->y());
// if (SelItem.count() == 0)
if (!inText)
{
Deselect(true);
3797,6 → 3775,7
{
SeleItem(m);
Deselect(false);
// z = PaintPolyLine(Rxp, Ryp, 1+Rxpd, 1+Rypd, doku->Dwidth, doku->Dbrush, doku->Dpen);
z = PaintPolyLine(Rxp, Ryp, 1+Rxpd, 1+Rypd, doku->Dwidth, "None", doku->Dpen);
b = Items.at(z);
SelItem.clear();
4076,6 → 4055,8
doku->ActPage = this;
emit PgCh(PageNr);
}
// if (Items.count() == 0)
// return false;
for (a = 0; a < Items.count(); ++a)
{
if (b->LayerNr == doku->ActiveLayer)
4213,6 → 4194,7
}
}
Deselect(true);
// emit HaveSel(-1);
SelItem.clear();
return false;
}
4744,6 → 4726,7
Deselect();
if (b->Ptext.count() == 0)
return;
// doku->loading = true;
for (uint a = 0; a < b->MaxChars; ++a)
{
pts.resize(0);
4835,6 → 4818,7
}
}
doku->GroupCounter++;
// doku->loading = false;
SelItem.clear();
SelItem.append(b);
DeleteItem();
/trunk/Scribus/scribus/autoform.h
52,7 → 52,7
void selForm(int a);
 
signals:
void FormSel(int, int, double *);
void FormSel(int);
 
protected:
QGridLayout* buttonGroup1Layout;
/trunk/Scribus/scribus/mpalette.h
264,7 → 264,7
void NewRotMode(int m);
void DoFlow();
void DoFlow2();
void MakeIrre(int f, int c, double *vals);
void MakeIrre(int f);
void EditSh();
void NewTDist();
void DoRevert();
/trunk/Scribus/scribus/scribusdoc.h
471,9 → 471,6
QString DocComments;
QString DocKeyWords;
int AppMode;
int SubMode;
double *ShapeValues;
int ValCount;
QString Dpen;
QString Dbrush;
double Dwidth;
/trunk/Scribus/scribus/libprefs/prefs.cpp
1504,7 → 1504,7
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer_3 );
PrefsLayout->addLayout( Layout3 );
setDS();
 
// signals and slots connections
connect( minColor, SIGNAL( clicked() ), this, SLOT( changeMicolor() ) );
connect( MaxColor, SIGNAL( clicked() ), this, SLOT( changeMaColor() ) );
1647,13 → 1647,13
 
void Preferences::setLeft(int v)
{
RandL = v / Umrech / 100.0;
RandR = v / Umrech / 100.0;
RightR->setMaxValue(Breite->value() - LeftR->value());
}
 
void Preferences::setRight(int v)
{
RandR = v / Umrech / 100.0;
RandL = v / Umrech / 100.0;
LeftR->setMaxValue(Breite->value() - RightR->value());
}
 
/trunk/Scribus/scribus/werktoolb.cpp
18,7 → 18,6
#include "werktoolb.h"
#include "werktoolb.moc"
#include "polyprops.h"
#include "autoform.h"
 
extern int PolyC;
extern int PolyFd;
29,12 → 28,6
 
WerkToolB::WerkToolB(QMainWindow* parent) : QToolBar( tr("Tools"), parent)
{
SubMode = 0;
ValCount = 32;
static double AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0,
0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
ShapeVals = AutoShapes0;
Select = new QToolButton(loadIcon("Kreuz.xpm"), tr("Select Items"), QString::null, this, SLOT(ModeFromTB()), this);
Select->setToggleButton(true);
Select->setOn(true);
41,24 → 34,19
Rotiere = new QToolButton(loadIcon("Rotieren.xpm"), tr("Rotate Item"), QString::null, this, SLOT(ModeFromTB()), this);
Rotiere->setToggleButton( true );
Rotiere->setEnabled(false);
Textedit = new QToolButton(loadIcon("Editm.xpm"), tr("Edit Contents of Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit->setToggleButton( true );
Textedit->setEnabled( FALSE );
Zoom = new QToolButton(loadIcon("Lupe.xpm"), tr("Zooms in or out"), QString::null, this, SLOT(ModeFromTB()), this);
Zoom->setToggleButton( true );
Texte = new QToolButton(loadIcon("Text.xpm"), tr("Insert Text Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Texte->setToggleButton( true );
Textedit = new QToolButton(loadIcon("Editm.xpm"), tr("Edit Contents of Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit->setToggleButton( true );
Textedit->setEnabled( FALSE );
KetteEin = new QToolButton(loadIcon("Lock.xpm"), tr("Create Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteEin->setToggleButton( true );
KetteEin->setEnabled(false);
KetteAus = new QToolButton(loadIcon("Unlock.xpm"), tr("Break Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteAus->setToggleButton( true );
KetteAus->setEnabled(false);
BildB = new QToolButton(loadIcon("Bild.xpm"), tr("Insert Picture"), QString::null, this, SLOT(ModeFromTB()), this);
BildB->setToggleButton( true );
Rechteck = new Autoforms( this );
Rechteck->setPopupDelay(0);
Rechteck = new QToolButton(loadIcon("Rechtecke.xpm"), tr("Insert Rectangles"), QString::null, this, SLOT(ModeFromTB()), this);
Rechteck->setToggleButton( true );
Kreis = new QToolButton(loadIcon("Kreise.xpm"), tr("Insert Ovals"), QString::null, this, SLOT(ModeFromTB()), this);
Kreis->setToggleButton( true );
PolyM = new QPopupMenu();
PolyM->insertItem( tr("Properties..."), this, SLOT(GetPolyProps()));
Polygon = new QToolButton(loadIcon("spline.png"), tr("Insert Polygons"), QString::null, this, SLOT(ModeFromTB()), this);
69,12 → 57,15
Linien->setToggleButton( true );
PolyLin = new QToolButton(loadIcon("beziertool.png"), tr("Insert Bezier Curves"), QString::null, this, SLOT(ModeFromTB()), this);
PolyLin->setToggleButton( true );
KetteEin = new QToolButton(loadIcon("Lock.xpm"), tr("Create Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteEin->setToggleButton( true );
KetteEin->setEnabled(false);
KetteAus = new QToolButton(loadIcon("Unlock.xpm"), tr("Break Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteAus->setToggleButton( true );
KetteAus->setEnabled(false);
setCloseMode(QDockWindow::Undocked);
connect(this, SIGNAL(placeChanged(QDockWindow::Place)), this, SLOT(Docken(QDockWindow::Place)));
connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(Verbergen(bool)));
connect(Rechteck, SIGNAL(FormSel(int, int, double *)), this, SLOT(SelShape(int, int, double *)));
connect(Rechteck, SIGNAL(clicked()), this, SLOT(SelShape2()));
QToolTip::add( Rechteck, tr( "Draws various Shapes" ) );
}
 
void WerkToolB::Docken(QDockWindow::Place p)
105,43 → 96,6
delete dia;
}
 
void WerkToolB::SelShape(int s, int c, double *vals)
{
Select->setOn(false);
Rotiere->setOn(false);
Textedit->setOn(false);
Zoom->setOn(false);
Texte->setOn(false);
BildB->setOn(false);
Linien->setOn(false);
KetteEin->setOn(false);
KetteAus->setOn(false);
Polygon->setOn(false);
PolyLin->setOn(false);
Rechteck->setOn(true);
SubMode = s;
ValCount = c;
ShapeVals = vals;
emit NewMode(2);
}
 
void WerkToolB::SelShape2()
{
Select->setOn(false);
Rotiere->setOn(false);
Textedit->setOn(false);
Zoom->setOn(false);
Texte->setOn(false);
BildB->setOn(false);
Linien->setOn(false);
KetteEin->setOn(false);
KetteAus->setOn(false);
Polygon->setOn(false);
PolyLin->setOn(false);
Rechteck->setOn(true);
emit NewMode(2);
}
 
void WerkToolB::ModeFromTB()
{
Select->setOn(false);
151,6 → 105,7
Texte->setOn(false);
BildB->setOn(false);
Rechteck->setOn(false);
Kreis->setOn(false);
Linien->setOn(false);
KetteEin->setOn(false);
KetteAus->setOn(false);
186,6 → 141,16
BildB->setOn(true);
emit NewMode(4);
}
if (Rechteck == sender())
{
Rechteck->setOn(true);
emit NewMode(2);
}
if (Kreis == sender())
{
Kreis->setOn(true);
emit NewMode(3);
}
if (Linien == sender())
{
Linien->setOn(true);
/trunk/Scribus/scribus/scribusdoc.cpp
137,7 → 137,6
hasName = false;
DoDrawing = true;
RotMode = 0;
SubMode = -1;
ASaveTimer = new QTimer(this);
MLineStyles.clear();
FT_Init_FreeType( &library );
/trunk/Scribus/scribus/werktoolb.h
24,7 → 24,6
#include <qtooltip.h>
#include <qpopupmenu.h>
 
class Autoforms;
/**
*@author Franz Schmid
*/
43,7 → 42,8
QToolButton* Texte;
QToolButton* BildB;
QToolButton* Linien;
Autoforms* Rechteck;
QToolButton* Kreis;
QToolButton* Rechteck;
QToolButton* Polygon;
QToolButton* PolyLin;
QPopupMenu* PolyM;
50,16 → 50,11
QToolButton* KetteEin;
QToolButton* KetteAus;
bool Sichtbar;
int SubMode;
int ValCount;
double *ShapeVals;
 
public slots:
void Docken(QDockWindow::Place p);
void Verbergen(bool vis);
void GetPolyProps();
void SelShape(int s, int c, double *vals);
void SelShape2();
void ModeFromTB();
signals: