r15553 by jghali - move PP line tab code into its own class
scribus-commit
scribus-commit at lists.scribus.net
Sun Oct 17 18:57:20 CEST 2010
Author: jghali
Date: Sun Oct 17 16:57:20 2010
New Revision: 15553
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15553
Log:
move PP line tab code into its own class
Added:
branches/ScribusOIF/scribus/ui/propertiespalette_line.cpp
branches/ScribusOIF/scribus/ui/propertiespalette_line.h
Modified:
branches/ScribusOIF/scribus/CMakeLists.txt
branches/ScribusOIF/scribus/canvasmode_legacy.cpp
branches/ScribusOIF/scribus/canvasmode_normal.cpp
branches/ScribusOIF/scribus/plugins/scriptplugin/svgimport.cpp
branches/ScribusOIF/scribus/scribus.cpp
branches/ScribusOIF/scribus/scribusview.cpp
branches/ScribusOIF/scribus/ui/propertiespalette.cpp
branches/ScribusOIF/scribus/ui/propertiespalette.h
branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp
branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
branches/ScribusOIF/scribus/ui/smlinestyle.cpp
branches/ScribusOIF/win32/vc8/Scribus.vcproj
Modified: branches/ScribusOIF/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/CMakeLists.txt
==============================================================================
--- branches/ScribusOIF/scribus/CMakeLists.txt (original)
+++ branches/ScribusOIF/scribus/CMakeLists.txt Sun Oct 17 16:57:20 2010
@@ -347,6 +347,7 @@
ui/printdialog.h
ui/propertiespalette.h
ui/propertiespalette_image.h
+ ui/propertiespalette_line.h
ui/propertiespalette_shape.h
ui/propertiespalette_utils.h
ui/propertiespalette_xyz.h
@@ -746,6 +747,7 @@
ui/printdialog.cpp
ui/propertiespalette.cpp
ui/propertiespalette_image.cpp
+ ui/propertiespalette_line.cpp
ui/propertiespalette_shape.cpp
ui/propertiespalette_utils.cpp
ui/propertiespalette_xyz.cpp
Modified: branches/ScribusOIF/scribus/canvasmode_legacy.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/canvasmode_legacy.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_legacy.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_legacy.cpp Sun Oct 17 16:57:20 2010
@@ -30,23 +30,17 @@
#include <QWidgetAction>
#include <QDebug>
-#include "ui/aligndistribute.h"
#include "canvas.h"
#include "canvasgesture_linemove.h"
#include "canvasgesture_resize.h"
#include "canvasgesture_rulermove.h"
-#include "ui/contextmenu.h"
-#include "ui/customfdialog.h"
#include "fpoint.h"
#include "fpointarray.h"
#include "hyphenator.h"
-#include "ui/insertTable.h"
#include "pageitem_textframe.h"
-#include "ui/pageselector.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
#include "scmimedata.h"
#include "scribus.h"
#include "scribusdoc.h"
@@ -61,8 +55,16 @@
#include "util_math.h"
#include "loadsaveplugin.h"
#include "fileloader.h"
+
#include "plugins/formatidlist.h"
+#include "ui/aligndistribute.h"
+#include "ui/contextmenu.h"
+#include "ui/customfdialog.h"
+#include "ui/insertTable.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
+#include "ui/propertiespalette_line.h"
LegacyMode::LegacyMode(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW)
@@ -5053,7 +5055,7 @@
m_ScMW->propertiesPalette->updateColorList();
m_ScMW->propertiesPalette->paraStyleCombo->updateFormatList();
m_ScMW->propertiesPalette->charStyleCombo->updateFormatList();
- m_ScMW->propertiesPalette->SetLineFormats(m_doc);
+ m_ScMW->propertiesPalette->linePal->updateLineStyles();
}
}
for (int a = 0; a < m_doc->m_Selection->count(); ++a)
Modified: branches/ScribusOIF/scribus/canvasmode_normal.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/canvasmode_normal.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_normal.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_normal.cpp Sun Oct 17 16:57:20 2010
@@ -60,6 +60,7 @@
#include "ui/insertTable.h"
#include "ui/pageselector.h"
#include "ui/propertiespalette.h"
+#include "ui/propertiespalette_line.h"
#include "plugins/formatidlist.h"
@@ -1417,7 +1418,7 @@
m_ScMW->propertiesPalette->updateColorList();
m_ScMW->propertiesPalette->paraStyleCombo->updateFormatList();
m_ScMW->propertiesPalette->charStyleCombo->updateFormatList();
- m_ScMW->propertiesPalette->SetLineFormats(m_doc);
+ m_ScMW->propertiesPalette->linePal->updateLineStyles();
}
}
for (int a = 0; a < m_doc->m_Selection->count(); ++a)
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/svgimport.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/svgimport.cpp
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/svgimport.cpp (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/svgimport.cpp Sun Oct 17 16:57:20 2010
@@ -16,6 +16,7 @@
#include "scribuscore.h"
#include "selection.h"
#include "ui/propertiespalette.h"
+#include "ui/propertiespalette_line.h"
#include <QString>
@@ -56,7 +57,7 @@
ScCore->primaryMainWindow()->propertiesPalette->updateColorList();
ScCore->primaryMainWindow()->propertiesPalette->paraStyleCombo->updateFormatList();
ScCore->primaryMainWindow()->propertiesPalette->charStyleCombo->updateFormatList();
- ScCore->primaryMainWindow()->propertiesPalette->SetLineFormats(ScCore->primaryMainWindow()->doc);
+ ScCore->primaryMainWindow()->propertiesPalette->linePal->updateLineStyles();
}
}
}
Modified: branches/ScribusOIF/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/scribus.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribus.cpp (original)
+++ branches/ScribusOIF/scribus/scribus.cpp Sun Oct 17 16:57:20 2010
@@ -189,6 +189,7 @@
#include "ui/printdialog.h"
#include "ui/propertiespalette.h"
#include "ui/propertiespalette_image.h"
+#include "ui/propertiespalette_line.h"
#include "ui/propertiespalette_shape.h"
#include "ui/propertiespalette_xyz.h"
#include "ui/query.h"
@@ -3247,7 +3248,7 @@
propertiesPalette->updateColorList();
propertiesPalette->paraStyleCombo->updateFormatList();
propertiesPalette->charStyleCombo->updateFormatList();
- propertiesPalette->SetLineFormats(doc);
+ propertiesPalette->linePal->updateLineStyles();
}
}
else if (rasterFiles.contains(fi.suffix().toLower()))
@@ -3447,7 +3448,7 @@
if (HaveDoc)
{
propertiesPalette->updateColorList();
- propertiesPalette->SetLineFormats(doc);
+ propertiesPalette->linePal->updateLineStyles();
styleManager->updateColorList();
}
}
@@ -3606,9 +3607,9 @@
propertiesPalette->updateColorList();
propertiesPalette->paraStyleCombo->setDoc(doc);
propertiesPalette->charStyleCombo->setDoc(doc);
- propertiesPalette->SetLineFormats(doc);
- propertiesPalette->startArrow->rebuildList(&doc->arrowStyles());
- propertiesPalette->endArrow->rebuildList(&doc->arrowStyles());
+ propertiesPalette->linePal->updateLineStyles();
+ propertiesPalette->linePal->startArrow->rebuildList(&doc->arrowStyles());
+ propertiesPalette->linePal->endArrow->rebuildList(&doc->arrowStyles());
symbolPalette->updateSymbolList();
if (!Mpa)
{
@@ -8384,7 +8385,7 @@
propertiesPalette->updateColorList();
propertiesPalette->paraStyleCombo->updateFormatList();
propertiesPalette->charStyleCombo->updateFormatList();
- propertiesPalette->SetLineFormats(docc);
+ propertiesPalette->linePal->updateLineStyles();
slotDocCh();
}
}
@@ -9942,7 +9943,7 @@
doc->PageColors = dia->m_colorList;
doc->recalculateColors();
doc->recalcPicturesRes();
- propertiesPalette->SetLineFormats(doc);
+ propertiesPalette->linePal->updateLineStyles();
styleManager->updateColorList();
}
propertiesPalette->updateColorList();
@@ -9984,7 +9985,7 @@
doc->recalculateColors();
doc->recalcPicturesRes();
propertiesPalette->updateColorList();
- propertiesPalette->SetLineFormats(doc);
+ propertiesPalette->linePal->updateLineStyles();
styleManager->updateColorList();
if (doc->m_Selection->count() != 0)
doc->m_Selection->itemAt(0)->emitAllToGUI();
Modified: branches/ScribusOIF/scribus/scribusview.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/scribusview.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scribusview.cpp (original)
+++ branches/ScribusOIF/scribus/scribusview.cpp Sun Oct 17 16:57:20 2010
@@ -111,6 +111,7 @@
#include "ui/pageselector.h"
#include "ui/propertiespalette.h"
#include "ui/propertiespalette_image.h"
+#include "ui/propertiespalette_line.h"
#include "ui/rulermover.h"
#include "ui/scmessagebox.h"
#include "ui/scrapbookpalette.h"
@@ -1044,7 +1045,7 @@
m_ScMW->symbolPalette->updateSymbolList();
m_ScMW->propertiesPalette->paraStyleCombo->updateFormatList();
m_ScMW->propertiesPalette->charStyleCombo->updateFormatList();
- m_ScMW->propertiesPalette->SetLineFormats(Doc);
+ m_ScMW->propertiesPalette->linePal->updateLineStyles();
undoManager->setUndoEnabled(true);
}
}
Modified: branches/ScribusOIF/scribus/ui/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/ui/propertiespalette.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.cpp Sun Oct 17 16:57:20 2010
@@ -54,6 +54,7 @@
#include "cpalette.h"
#include "pageitem_textframe.h"
#include "propertiespalette_image.h"
+#include "propertiespalette_line.h"
#include "propertiespalette_shape.h"
#include "propertiespalette_utils.h"
#include "propertiespalette_xyz.h"
@@ -573,113 +574,9 @@
pageLayout_5->setSpacing( 5 );
pageLayout_5->setMargin( 0 );
- LMode = false;
-
- Layout12_2 = new QGridLayout;
- Layout12_2->setSpacing( 3 );
- Layout12_2->setMargin( 0 );
- LStyle = new LineCombo(page_5);
- LStyle->addItem( tr("Custom"));
- LineMode = new ScComboBox( page_5 );
- LineModeT = new QLabel( "&Basepoint:", page_5 );
- LineModeT->setBuddy(LineMode);
- Layout12_2->addWidget( LineModeT, 0, 0 );
- Layout12_2->addWidget( LineMode, 0, 1 );
- linetypeLabel = new QLabel( "T&ype of Line:", page_5 );
- linetypeLabel->setBuddy(LStyle);
- Layout12_2->addWidget( linetypeLabel, 1, 0 );
- Layout12_2->addWidget( LStyle, 1, 1 );
-
- dashEditor = new DashEditor(page_5);
- Layout12_2->addWidget(dashEditor, 2, 0, 1, 2);
-
- startArrow = new ArrowChooser(page_5, true);
- Layout12_2->addWidget( startArrow, 4, 0 );
- endArrow = new ArrowChooser(page_5, false);
- Layout12_2->addWidget( endArrow, 4, 1 );
- startArrowText = new QLabel( "Start Arrow:", page_5 );
- startArrowText->setBuddy(startArrow);
- Layout12_2->addWidget( startArrowText, 3, 0 );
- endArrowText = new QLabel( "End Arrow:", page_5 );
- endArrowText->setBuddy(endArrow);
- Layout12_2->addWidget( endArrowText, 3, 1 );
-
- Layout12_2a = new QHBoxLayout;
- Layout12_2a->setSpacing( 3 );
- Layout12_2a->setMargin( 0 );
- startArrowSpinText = new QLabel( "Scaling:", page_5 );
- Layout12_2a->addWidget(startArrowSpinText);
- startArrowScaleSpin = new QSpinBox(page_5 );
- startArrowScaleSpin->setMaximum( 300 );
- startArrowScaleSpin->setMinimum( 1 );
- Layout12_2a->addWidget(startArrowScaleSpin);
- Layout12_2->addLayout(Layout12_2a, 5, 0);
-
- Layout12_2b = new QHBoxLayout;
- Layout12_2b->setSpacing( 3 );
- Layout12_2b->setMargin( 0 );
- endArrowSpinText = new QLabel( "Scaling:", page_5 );
- Layout12_2b->addWidget(endArrowSpinText);
- endArrowScaleSpin = new QSpinBox(page_5 );
- endArrowScaleSpin->setMaximum( 300 );
- endArrowScaleSpin->setMinimum( 1 );
- Layout12_2b->addWidget(endArrowScaleSpin);
- Layout12_2->addLayout( Layout12_2b, 5, 1 );
-
- LSize = new ScrSpinBox( page_5, 0 );
- linewidthLabel = new QLabel( "Line &Width:", page_5 );
- linewidthLabel->setBuddy(LSize);
- Layout12_2->addWidget( linewidthLabel, 6, 0 );
- Layout12_2->addWidget( LSize, 6, 1 );
- LJoinStyle = new ScComboBox( page_5 );
- edgesLabel = new QLabel( "Ed&ges:", page_5 );
- edgesLabel->setBuddy(LJoinStyle);
- Layout12_2->addWidget( edgesLabel, 7, 0 );
- Layout12_2->addWidget( LJoinStyle, 7, 1 );
- LEndStyle = new ScComboBox( page_5 );
- endingsLabel = new QLabel( "&Endings:", page_5 );
- endingsLabel->setBuddy(LEndStyle);
- Layout12_2->addWidget( endingsLabel, 8, 0 );
- Layout12_2->addWidget( LEndStyle, 8, 1 );
- pageLayout_5->addLayout( Layout12_2 );
-
- TabStack3 = new QStackedWidget( page_5 );
- TabStack3->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
-
- page_5a = new QWidget( TabStack3 );
- pageLayout_5a = new QVBoxLayout( page_5a );
- pageLayout_5a->setSpacing( 5 );
- pageLayout_5a->setMargin( 0 );
- StyledLine = new QListWidget(page_5a);
- StyledLine->setItemDelegate(new LineFormatItemDelegate);
- StyledLine->addItem( "No Style" );
- pageLayout_5a->addWidget(StyledLine);
- TabStack3->addWidget( page_5a );
-
- page_5b = new QWidget( TabStack3 );
- pageLayout_5b = new QVBoxLayout( page_5b );
- pageLayout_5b->setSpacing( 5 );
- pageLayout_5b->setMargin( 0 );
- TLines = new QGroupBox( "Cell Lines", page_5b );
- TLineLayout = new QVBoxLayout( TLines );
- TLineLayout->setSpacing( 2 );
- TLineLayout->setMargin( 5 );
- TLineLayout->setAlignment( Qt::AlignTop );
- TopLine = new QCheckBox( TLines );
- TopLine->setText( "Line at Top" );
- TLineLayout->addWidget(TopLine);
- LeftLine = new QCheckBox( TLines );
- LeftLine->setText( "Line at the Left" );
- TLineLayout->addWidget(LeftLine);
- RightLine = new QCheckBox( TLines );
- RightLine->setText( "Line at the Right " );
- TLineLayout->addWidget(RightLine);
- BottomLine = new QCheckBox( TLines );
- BottomLine->setText( "Line at Bottom" );
- TLineLayout->addWidget(BottomLine);
- pageLayout_5b->addWidget(TLines);
- TabStack3->addWidget( page_5b );
- pageLayout_5->addWidget( TabStack3 );
+ linePal = new PropertiesPalette_Line(page_5);
+ pageLayout_5->addWidget(linePal);
+
idLineItem=TabStack->addItem( page_5, "&Line" );
page_6 = new QWidget( TabStack );
@@ -702,15 +599,11 @@
languageChange();
+ connect(linePal, SIGNAL(lineModeChanged(int)), this, SLOT(NewLineMode(int)));
+
connect(LineSp, SIGNAL(valueChanged(double)), this, SLOT(NewLineSpacing()));
connect(Size, SIGNAL(valueChanged(double)), this, SLOT(NewSize()));
connect(Extra, SIGNAL(valueChanged(double)), this, SLOT(NewTracking()));
- connect(LSize, SIGNAL(valueChanged(double)), this, SLOT(NewLineWidth()));
- connect(LStyle, SIGNAL(activated(int)), this, SLOT(NewLineStyle()));
- connect(LJoinStyle, SIGNAL(activated(int)), this, SLOT(NewLineJoin()));
- connect(LEndStyle, SIGNAL(activated(int)), this, SLOT(NewLineEnd()));
- connect(LineMode, SIGNAL(activated(int)), this, SLOT(NewLineMode()));
- connect(dashEditor, SIGNAL(dashChanged()), this, SLOT(dashChange()));
connect(GroupAlign, SIGNAL(State(int)), this, SLOT(NewAlignement(int)));
connect(Revert, SIGNAL(clicked()), this, SLOT(DoRevert()));
connect(charStyleClear, SIGNAL(clicked()), this, SLOT(doClearCStyle()));
@@ -735,7 +628,6 @@
connect(DBottom, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
connect(flopGroup, SIGNAL(buttonClicked( int )), this, SLOT(flop(int)));
connect(TabStack, SIGNAL(currentChanged(int)), this, SLOT(SelTab(int)));
- connect(StyledLine, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(SetSTline(QListWidgetItem*)));
connect(Fonts, SIGNAL(fontSelected(QString )), this, SLOT(NewTFont(QString)));
connect(TxFill, SIGNAL(activated(int)), this, SLOT(newTxtFill()));
connect(TxStroke, SIGNAL(activated(int)), this, SLOT(newTxtStroke()));
@@ -750,10 +642,6 @@
connect(Dist, SIGNAL(valueChanged(double)), this, SLOT(handlePathDist()));
connect(LineW, SIGNAL(valueChanged(double)), this, SLOT(handlePathOffs()));
connect( TabsButton, SIGNAL( clicked() ), this, SLOT( ManageTabs() ) );
- connect( TopLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
- connect( LeftLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
- connect( RightLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
- connect( BottomLine, SIGNAL( clicked() ), this, SLOT( HandleTLines() ) );
connect(colgapLabel, SIGNAL(activated(int)), this, SLOT(HandleGapSwitch()));
connect( Cpal, SIGNAL(NewSpecial(double, double, double, double, double, double, double, double, double, double)), this, SLOT(NewSpGradient(double, double, double, double, double, double, double, double, double, double )));
connect( Cpal, SIGNAL(editGradient(int)), this, SLOT(toggleGradientEdit(int)));
@@ -761,10 +649,6 @@
connect( Tpal, SIGNAL(editGradient()), this, SLOT(toggleGradientEditM()));
connect( TpalGroup, SIGNAL(NewSpecial(double, double, double, double, double, double, double, double, double, double)), this, SLOT(NewSpGradientM(double, double, double, double, double, double, double, double )));
connect( TpalGroup, SIGNAL(editGradient()), this, SLOT(toggleGradientEditMGroup()));
- connect(startArrow, SIGNAL(activated(int)), this, SLOT(setStartArrow(int )));
- connect(endArrow, SIGNAL(activated(int)), this, SLOT(setEndArrow(int )));
- connect(startArrowScaleSpin, SIGNAL(valueChanged(int)), this, SLOT(setStartArrowScale(int )));
- connect(endArrowScaleSpin, SIGNAL(valueChanged(int)), this, SLOT(setEndArrowScale(int )));
connect(lineSpacingModeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(setLineSpacingMode(int)));
connect(optMarginRadioNone, SIGNAL(clicked()), this, SLOT(setOpticalMargins()) );
connect(optMarginRadioBoth, SIGNAL(clicked()), this, SLOT(setOpticalMargins()) );
@@ -772,14 +656,12 @@
connect(optMarginRadioRight, SIGNAL(clicked()), this, SLOT(setOpticalMargins()) );
connect(optMarginResetButton, SIGNAL(clicked()), this, SLOT(resetOpticalMargins()) );
-
connect(minWordTrackingSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setMinWordTracking()) );
connect(normWordTrackingSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setNormWordTracking()) );
connect(minGlyphExtSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setMinGlyphExtension()) );
connect(maxGlyphExtSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setMaxGlyphExtension()) );
HaveItem = false;
- TabStack3->setCurrentIndex(0);
for (int ws = 1; ws < 8; ++ws)
TabStack->setItemEnabled(ws, false);
TabStack->setCurrentIndex(0);
@@ -819,6 +701,7 @@
this->xyzPal->setMainWindow(mw);
this->shapePal->setMainWindow(mw);
this->imagePal->setMainWindow(mw);
+ this->linePal->setMainWindow(mw);
connect(this, SIGNAL(DocChanged()), m_ScMW, SLOT(slotDocCh()));
connect(this, SIGNAL(NewAlignment(int)), m_ScMW, SLOT(setNewAlignment(int)));
@@ -907,6 +790,7 @@
xyzPal->setDoc(doc);
shapePal->setDoc(doc);
imagePal->setDoc(doc);
+ linePal->setDoc(doc);
Extra->setValues( -300, 300, 2, 0);
Size->setValues( 0.5, 2048, 2, 1);
@@ -921,8 +805,6 @@
DLeft->setDecimals(2);
DBottom->setDecimals(2);
DRight->setDecimals(2);
- LSize->setMaximum( 300 );
- LSize->setMinimum( 0 );
Dist->setMaximum( 30000 );
Dist->setMinimum( 0 );
Dist->setSingleStep(10);
@@ -934,9 +816,6 @@
paraStyleCombo->setDoc(doc);
charStyleCombo->setDoc(doc);
- SetLineFormats(doc);
- startArrow->rebuildList(&doc->arrowStyles());
- endArrow->rebuildList(&doc->arrowStyles());
connect(this->Tpal, SIGNAL(NewTrans(double)), doc, SLOT(itemSelection_SetItemFillTransparency(double)));
connect(this->Tpal, SIGNAL(NewTransS(double)), doc, SLOT(itemSelection_SetItemLineTransparency(double)));
@@ -980,6 +859,8 @@
shapePal->unsetDoc();
imagePal->unsetItem();
imagePal->unsetDoc();
+ linePal->unsetItem();
+ linePal->unsetDoc();
Cpal->setCurrentItem(NULL);
Cpal->setDocument(NULL);
@@ -989,7 +870,6 @@
TpalGroup->setCurrentItem(NULL);
paraStyleCombo->setDoc(0);
charStyleCombo->setDoc(0);
- SetLineFormats(0);
HaveItem = false;
for (int ws = 1; ws < 8; ++ws)
TabStack->setItemEnabled(ws, false);
@@ -1005,7 +885,6 @@
Cpal->setCurrentItem(NULL);
Tpal->setCurrentItem(NULL);
TpalGroup->setCurrentItem(NULL);
- dashEditor->hide();
NewSel(-1);
}
@@ -1046,14 +925,8 @@
if (!doc)
setDoc(i->doc());
- disconnect(StyledLine, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(SetSTline(QListWidgetItem*)));
- disconnect(startArrow, SIGNAL(activated(int)), this, SLOT(setStartArrow(int )));
- disconnect(endArrow, SIGNAL(activated(int)), this, SLOT(setEndArrow(int )));
- disconnect(startArrowScaleSpin, SIGNAL(valueChanged(int)), this, SLOT(setStartArrowScale(int )));
- disconnect(endArrowScaleSpin, SIGNAL(valueChanged(int)), this, SLOT(setEndArrowScale(int )));
- disconnect(TabStack, SIGNAL(currentChanged(int)), this, SLOT(SelTab(int)));
- disconnect(LineMode, SIGNAL(activated(int)), this, SLOT(NewLineMode()));
-
+ disconnect(TabStack, SIGNAL(currentChanged(int)) , this, SLOT(SelTab(int)));
+ disconnect(linePal , SIGNAL(lineModeChanges(int)), this, SLOT(NewLineMode(int)));
HaveItem = false;
CurItem = i;
@@ -1061,30 +934,14 @@
xyzPal->handleSelectionChanged();
shapePal->handleSelectionChanged();
imagePal->handleSelectionChanged();
+ linePal->handleSelectionChanged();
Cpal->setCurrentItem(CurItem);
Cpal->updateFromItem();
Tpal->setCurrentItem(CurItem);
Tpal->updateFromItem();
TpalGroup->setCurrentItem(CurItem);
- if ((CurItem->asLine()) || (CurItem->asPolyLine()))
- {
- startArrow->setEnabled(true);
- endArrow->setEnabled(true);
- startArrow->setCurrentIndex(CurItem->startArrowIndex());
- endArrow->setCurrentIndex(CurItem->endArrowIndex());
- startArrowScaleSpin->setEnabled(true);
- endArrowScaleSpin->setEnabled(true);
- endArrowScaleSpin->setValue(CurItem->endArrowScale());
- startArrowScaleSpin->setValue(CurItem->startArrowScale());
- }
- else
- {
- startArrow->setEnabled(false);
- endArrow->setEnabled(false);
- startArrowScaleSpin->setEnabled(false);
- endArrowScaleSpin->setEnabled(false);
- }
+
QString tm;
PageItem_TextFrame *i2=CurItem->asTextFrame();
if (i2!=0)
@@ -1132,52 +989,10 @@
}
Revert->setChecked(CurItem->reversed());
setTextFlowMode(CurItem->textFlowMode());
- if (StyledLine->currentItem())
- StyledLine->currentItem()->setSelected(false);
- bool setter;
- if (CurItem->NamedLStyle.isEmpty())
- {
- setter = true;
- QListWidgetItem *itemStl = NULL;
- itemStl = StyledLine->item(0);
- if (itemStl != NULL)
- itemStl->setSelected(true);
- }
- else
- {
- QList<QListWidgetItem*> results (StyledLine->findItems(CurItem->NamedLStyle, Qt::MatchFixedString|Qt::MatchCaseSensitive));
- if (results.count() > 0)
- results[0]->setSelected(true); //Qt3-QListBox::ExactMatch));
- setter = false;
- }
- LStyle->setEnabled(setter);
- LSize->setEnabled(setter);
- LJoinStyle->setEnabled(setter);
- LEndStyle->setEnabled(setter);
- if (CurItem->dashes().count() == 0)
- dashEditor->hide();
- else
- {
- LStyle->setCurrentIndex(37);
- dashEditor->setDashValues(CurItem->dashes(), qMax(CurItem->lineWidth(), 0.001), CurItem->dashOffset());
- dashEditor->show();
- }
- if (LMode)
- LineMode->setCurrentIndex(1);
- else
- LineMode->setCurrentIndex(0);
- connect(StyledLine, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(SetSTline(QListWidgetItem*)));
- connect(startArrow, SIGNAL(activated(int)), this, SLOT(setStartArrow(int )));
- connect(endArrow, SIGNAL(activated(int)), this, SLOT(setEndArrow(int )));
- connect(LineMode, SIGNAL(activated(int)), this, SLOT(NewLineMode()));
- connect(startArrowScaleSpin, SIGNAL(valueChanged(int)), this, SLOT(setStartArrowScale(int )));
- connect(endArrowScaleSpin, SIGNAL(valueChanged(int)), this, SLOT(setEndArrowScale(int )));
+
+ connect(linePal , SIGNAL(lineModeChanges(int)), this, SLOT(NewLineMode(int)));
//CB replaces old emits from PageItem::emitAllToGUI()
- disconnect(LSize, SIGNAL(valueChanged(double)), this, SLOT(NewLineWidth()));
- disconnect(LStyle, SIGNAL(activated(int)), this, SLOT(NewLineStyle()));
- disconnect(LJoinStyle, SIGNAL(activated(int)), this, SLOT(NewLineJoin()));
- disconnect(LEndStyle, SIGNAL(activated(int)), this, SLOT(NewLineEnd()));
disconnect(DTop, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
disconnect(DLeft, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
disconnect(DRight, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
@@ -1200,29 +1015,11 @@
//CB TODO reconnect PP signals from here
- connect(LSize, SIGNAL(valueChanged(double)), this, SLOT(NewLineWidth()));
- connect(LStyle, SIGNAL(activated(int)), this, SLOT(NewLineStyle()));
- connect(LJoinStyle, SIGNAL(activated(int)), this, SLOT(NewLineJoin()));
- connect(LEndStyle, SIGNAL(activated(int)), this, SLOT(NewLineEnd()));
connect(DTop, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
connect(DLeft, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
connect(DRight, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
connect(DBottom, SIGNAL(valueChanged(double)), this, SLOT(NewTDist()));
- if ((CurItem->isTableItem) && (CurItem->isSingleSel))
- {
- setter = true;
- TabStack3->setCurrentIndex(1);
- TopLine->setChecked(CurItem->TopLine);
- LeftLine->setChecked(CurItem->LeftLine);
- RightLine->setChecked(CurItem->RightLine);
- BottomLine->setChecked(CurItem->BottomLine);
- }
- else
- {
- setter = false;
- TabStack3->setCurrentIndex(0);
- }
if ((CurItem->isGroupControl) || ((CurItem->Groups.count() != 0) && (!CurItem->isSingleSel)))
{
TabStack->setItemEnabled(idXYZItem, true);
@@ -1282,12 +1079,10 @@
HaveItem = true;
SelTab(TabStack->currentIndex());
- setLineWidth(i->lineWidth());
- setLIvalue(i->lineStyle(), i->lineEnd(), i->lineJoin());
-
xyzPal->handleSelectionChanged();
shapePal->handleSelectionChanged();
imagePal->handleSelectionChanged();
+ linePal->handleSelectionChanged();
if (CurItem->asOSGFrame())
{
@@ -1342,6 +1137,7 @@
xyzPal->newSelection(nr);
shapePal->newSelection(nr);
imagePal->newSelection(nr);
+ linePal->newSelection(nr);
if (doc->m_Selection->count()>1)
{
@@ -1366,7 +1162,6 @@
i=doc->m_Selection->itemAt(0);
HaveItem=true;
}
- LineMode->setEnabled(false);
visID = TabStack->currentIndex();
TabStack->widget(0)->setEnabled(true);
TabStack->setItemEnabled(idXYZItem, true);
@@ -1415,7 +1210,6 @@
TabStack->setItemEnabled(idTextItem, false);
TabStack->setItemEnabled(idImageItem, false);
TabStack->setItemEnabled(idLineItem, true);
- LineMode->setEnabled(true);
break;
case PageItem::ItemType1:
case PageItem::ItemType3:
@@ -1461,9 +1255,10 @@
return;
//CB Having added the selection and undo transaction to mirrorpolyh/v in doc,
//these can be enabled all the time
- xyzPal->setMultipleSelection(true);
- shapePal->setMultipleSelection(true);
- imagePal->setMultipleSelection(true);
+ xyzPal->setMultipleSelection(isMultiple);
+ shapePal->setMultipleSelection(isMultiple);
+ imagePal->setMultipleSelection(isMultiple);
+ linePal->setMultipleSelection(isMultiple);
if (doc->m_Selection->count() > 1)
{
@@ -1492,13 +1287,13 @@
xyzPal->unitChange();
shapePal->unitChange();
imagePal->unitChange();
+ linePal->unitChange();
dGap->setNewUnit( m_unitIndex );
DLeft->setNewUnit( m_unitIndex );
DTop->setNewUnit( m_unitIndex );
DBottom->setNewUnit( m_unitIndex );
DRight->setNewUnit( m_unitIndex );
- LSize->setNewUnit( m_unitIndex );
Cpal->unitChange(oldRatio, m_unitRatio, doc->unitIndex());
Tpal->unitChange(oldRatio, m_unitRatio, doc->unitIndex());
TpalGroup->unitChange(oldRatio, m_unitRatio, doc->unitIndex());
@@ -1617,80 +1412,6 @@
HaveItem = tmp;
}
-void PropertiesPalette::setLineWidth(double s)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- bool tmp = HaveItem;
- HaveItem = false;
- LSize->setValue(s*m_unitRatio);
- if (tmp)
- {
- if (CurItem->dashes().count() != 0)
- {
- if (CurItem->lineWidth() != 0.0)
- {
- dashEditor->setDashValues(CurItem->dashes(), CurItem->lineWidth(), CurItem->dashOffset());
- dashEditor->setEnabled(true);
- }
- else
- dashEditor->setEnabled(false);
- }
- }
- HaveItem = tmp;
-}
-
-void PropertiesPalette::setLIvalue(Qt::PenStyle p, Qt::PenCapStyle pc, Qt::PenJoinStyle pj)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- bool tmp = HaveItem;
- HaveItem = false;
- if (tmp)
- {
- if (CurItem->dashes().count() != 0)
- {
- LStyle->setCurrentIndex(37);
- dashEditor->setDashValues(CurItem->dashes(), qMax(CurItem->lineWidth(), 0.001), CurItem->dashOffset());
- }
- else
- LStyle->setCurrentIndex(static_cast<int>(p) - 1);
- }
- else
- LStyle->setCurrentIndex(static_cast<int>(p) - 1);
- switch (pc)
- {
- case Qt::FlatCap:
- LEndStyle->setCurrentIndex(0);
- break;
- case Qt::SquareCap:
- LEndStyle->setCurrentIndex(1);
- break;
- case Qt::RoundCap:
- LEndStyle->setCurrentIndex(2);
- break;
- default:
- LEndStyle->setCurrentIndex(0);
- break;
- }
- switch (pj)
- {
- case Qt::MiterJoin:
- LJoinStyle->setCurrentIndex(0);
- break;
- case Qt::BevelJoin:
- LJoinStyle->setCurrentIndex(1);
- break;
- case Qt::RoundJoin:
- LJoinStyle->setCurrentIndex(2);
- break;
- default:
- LJoinStyle->setCurrentIndex(0);
- break;
- }
- HaveItem = tmp;
-}
-
void PropertiesPalette::setFlop( FirstLineOffsetPolicy f )
{
if(f == FLOPFontAscent)
@@ -1991,168 +1712,14 @@
doc->itemSelection_SetTracking(qRound(Extra->value() * 10.0));
}
-void PropertiesPalette::NewLineWidth()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((HaveDoc) && (HaveItem))
- {
- double oldL = CurItem->lineWidth();
- doc->itemSelection_SetLineWidth(LSize->value() / m_unitRatio);
- if (CurItem->dashes().count() != 0)
- {
- if ((oldL != 0.0) && (CurItem->lineWidth() != 0.0))
- {
- for (int a = 0; a < CurItem->DashValues.count(); a++)
- {
- CurItem->DashValues[a] = CurItem->DashValues[a] / oldL * CurItem->lineWidth();
- }
- CurItem->setDashOffset(CurItem->dashOffset() / oldL * CurItem->lineWidth());
- }
- if (CurItem->lineWidth() != 0.0)
- {
- dashEditor->setDashValues(CurItem->dashes(), CurItem->lineWidth(), CurItem->dashOffset());
- dashEditor->setEnabled(true);
- }
- else
- dashEditor->setEnabled(false);
- }
- }
-}
-
-void PropertiesPalette::setStartArrow(int id)
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- doc->itemSelection_ApplyArrowHead(id,-1);
-}
-
-void PropertiesPalette::setEndArrow(int id)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((HaveDoc) && (HaveItem))
- doc->itemSelection_ApplyArrowHead(-1, id);
-}
-
-void PropertiesPalette::setStartArrowScale(int sc)
-{
- if (!HaveDoc || !HaveItem || !m_ScMW || m_ScMW->scriptIsRunning())
- return;
- doc->itemSelection_ApplyArrowScale(sc, -1, NULL);
-}
-
-void PropertiesPalette::setEndArrowScale(int sc)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((HaveDoc) && (HaveItem))
- doc->itemSelection_ApplyArrowScale(-1, sc, NULL);
-}
-
-void PropertiesPalette::NewLineStyle()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((HaveDoc) && (HaveItem))
- {
- if (LStyle->currentIndex() == 37)
- {
- if (CurItem->dashes().count() == 0)
- {
- if ((CurItem->lineStyle() == 0) || (CurItem->lineStyle() == 1))
- {
- CurItem->DashValues.append(4.0 * qMax(CurItem->lineWidth(), 1.0));
- CurItem->DashValues.append(2.0 * qMax(CurItem->lineWidth(), 1.0));
- }
- else
- getDashArray(CurItem->lineStyle(), qMax(CurItem->lineWidth(), 1.0), CurItem->DashValues);
- }
- if (CurItem->lineWidth() != 0.0)
- dashEditor->setDashValues(CurItem->dashes(), CurItem->lineWidth(), CurItem->dashOffset());
- else
- {
- dashEditor->setEnabled(false);
- dashEditor->setDashValues(CurItem->dashes(), 1.0, CurItem->dashOffset());
- }
- dashEditor->show();
- CurItem->update();
- }
- else
- {
- CurItem->DashValues.clear();
- dashEditor->hide();
- doc->itemSelection_SetLineArt(static_cast<Qt::PenStyle>(LStyle->currentIndex()+1));
- }
- }
-}
-
-void PropertiesPalette::dashChange()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if ((HaveDoc) && (HaveItem))
- {
- if (CurItem->lineWidth() != 0.0)
- {
- CurItem->setDashes(dashEditor->getDashValues(CurItem->lineWidth()));
- CurItem->setDashOffset(dashEditor->Offset->value() * CurItem->lineWidth());
- }
- CurItem->update();
- emit DocChanged();
- }
-}
-
-void PropertiesPalette::NewLineMode()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- xyzPal->setLineMode(LineMode->currentIndex());
+void PropertiesPalette::NewLineMode(int mode)
+{
+ if (!m_ScMW || m_ScMW->scriptIsRunning())
+ return;
+ xyzPal->setLineMode(mode);
xyzPal->displayWH(CurItem->width(), CurItem->height());
updateGeometry();
repaint();
-}
-
-void PropertiesPalette::NewLineJoin()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- Qt::PenJoinStyle c = Qt::MiterJoin;
- switch (LJoinStyle->currentIndex())
- {
- case 0:
- c = Qt::MiterJoin;
- break;
- case 1:
- c = Qt::BevelJoin;
- break;
- case 2:
- c = Qt::RoundJoin;
- break;
- }
- if ((HaveDoc) && (HaveItem))
- doc->itemSelection_SetLineJoin(c);
-}
-
-void PropertiesPalette::NewLineEnd()
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- Qt::PenCapStyle c = Qt::FlatCap;
- switch (LEndStyle->currentIndex())
- {
- case 0:
- c = Qt::FlatCap;
- break;
- case 1:
- c = Qt::SquareCap;
- break;
- case 2:
- c = Qt::RoundCap;
- break;
- }
- if ((HaveDoc) && (HaveItem))
- doc->itemSelection_SetLineEnd(c);
}
void PropertiesPalette::NewAlignement(int a)
@@ -2589,40 +2156,6 @@
}
}
-
-void PropertiesPalette::SetLineFormats(ScribusDoc *dd)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- disconnect(StyledLine, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(SetSTline(QListWidgetItem*)));
- StyledLine->clear();
- if (dd != 0)
- {
- QMap<QString,multiLine>::Iterator it;
- for (it = dd->MLineStyles.begin(); it != dd->MLineStyles.end(); ++it)
- StyledLine->addItem( new LineFormatItem(dd, it.value(), it.key()) );
- StyledLine->sortItems();
- StyledLine->insertItem( 0, tr("No Style"));
- if (StyledLine->currentItem())
- StyledLine->currentItem()->setSelected(false);
- }
- connect(StyledLine, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(SetSTline(QListWidgetItem*)));
-}
-
-void PropertiesPalette::SetSTline(QListWidgetItem *c)
-{
- if (!m_ScMW || m_ScMW->scriptIsRunning())
- return;
- if (c == NULL)
- return;
- bool setter = (c->listWidget()->currentRow() == 0);
- doc->itemSelection_SetNamedLineStyle(setter ? QString("") : c->text());
- LStyle->setEnabled(setter);
- LSize->setEnabled(setter);
- LJoinStyle->setEnabled(setter);
- LEndStyle->setEnabled(setter);
-}
-
void PropertiesPalette::updateColorList()
{
if (!HaveDoc || !m_ScMW || m_ScMW->scriptIsRunning())
@@ -2821,19 +2354,6 @@
}
}
-void PropertiesPalette::HandleTLines()
-{
- if ((HaveDoc) && (HaveItem))
- {
- CurItem->TopLine = TopLine->isChecked();
- CurItem->LeftLine = LeftLine->isChecked();
- CurItem->RightLine = RightLine->isChecked();
- CurItem->BottomLine = BottomLine->isChecked();
- CurItem->update();
- emit DocChanged();
- }
-}
-
void PropertiesPalette::installSniffer(ScrSpinBox *spinBox)
{
const QList<QObject*> list = spinBox->children();
@@ -2897,6 +2417,7 @@
xyzPal->languageChange();
shapePal->languageChange();
imagePal->languageChange();
+ linePal->languageChange();
EditShape2->setText( tr("&Edit..."));
SRect2->setText( tr("Shape:"));
@@ -2953,53 +2474,6 @@
lineSpacingModeCombo->addItem( tr("Automatic Linespacing"));
lineSpacingModeCombo->addItem( tr("Align to Baseline Grid"));
lineSpacingModeCombo->setCurrentIndex(oldLineSpacingMode);
- int oldLineStyle = LStyle->currentIndex();
- LStyle->clear();
- LStyle->updateList();
- LStyle->addItem( tr("Custom"));
- LStyle->setCurrentIndex(oldLineStyle);
- int oldLineMode=LineMode->currentIndex();
- LineMode->clear();
- LineMode->addItem( tr("Left Point"));
- LineMode->addItem( tr("End Points"));
- LineMode->setCurrentIndex(oldLineMode);
- LineModeT->setText( tr("&Basepoint:"));
- linetypeLabel->setText( tr("T&ype of Line:"));
- startArrowText->setText( tr("Start Arrow:"));
- endArrowText->setText( tr("End Arrow:"));
- startArrowSpinText->setText( tr("Scaling:"));
- endArrowSpinText->setText( tr("Scaling:"));
- if (HaveDoc)
- {
- int arrowItem=startArrow->currentIndex();
- startArrow->rebuildList(&doc->arrowStyles());
- startArrow->setCurrentIndex(arrowItem);
- arrowItem=endArrow->currentIndex();
- endArrow->rebuildList(&doc->arrowStyles());
- endArrow->setCurrentIndex(arrowItem);
- }
- linewidthLabel->setText( tr("Line &Width:"));
- edgesLabel->setText( tr("Ed&ges:"));
- int oldLJoinStyle=LJoinStyle->currentIndex();
- LJoinStyle->clear();
- LJoinStyle->addItem(loadIcon("16/stroke-join-miter.png"), tr("Miter Join"));
- LJoinStyle->addItem(loadIcon("16/stroke-join-bevel.png"), tr("Bevel Join"));
- LJoinStyle->addItem(loadIcon("16/stroke-join-round.png"), tr("Round Join"));
- LJoinStyle->setCurrentIndex(oldLJoinStyle);
-
- int oldLEndStyle=LEndStyle->currentIndex();
- LEndStyle->clear();
- LEndStyle->addItem(loadIcon("16/stroke-cap-butt.png"), tr("Flat Cap"));
- LEndStyle->addItem(loadIcon("16/stroke-cap-square.png"), tr("Square Cap"));
- LEndStyle->addItem(loadIcon("16/stroke-cap-round.png"), tr("Round Cap"));
- LEndStyle->setCurrentIndex(oldLEndStyle);
- endingsLabel->setText( tr("&Endings:"));
-
- TLines->setTitle( tr("Cell Lines"));
- TopLine->setText( tr("Line at Top"));
- LeftLine->setText( tr("Line at the Left"));
- RightLine->setText( tr("Line at the Right "));
- BottomLine->setText( tr("Line at Bottom"));
QString pctSuffix=tr(" %");
ChBase->setSuffix(pctSuffix);
@@ -3010,8 +2484,6 @@
normWordTrackingSpinBox->setSuffix(pctSuffix);
minGlyphExtSpinBox->setSuffix(pctSuffix);
maxGlyphExtSpinBox->setSuffix(pctSuffix);
- startArrowScaleSpin->setSuffix(pctSuffix);
- endArrowScaleSpin->setSuffix(pctSuffix);
QString ptSuffix = tr(" pt");
Dist->setSuffix(ptSuffix);
@@ -3021,8 +2493,6 @@
QString ein = (HaveDoc) ? unitGetSuffixFromIndex(doc->unitIndex()) : ptSuffix;
- LSize->setSuffix(ein);
- LSize->setSpecialValueText( tr("Hairline"));
dGap->setSuffix(ein);
DLeft->setSuffix(ein);
DTop->setSuffix(ein);
@@ -3031,9 +2501,6 @@
SeStyle->languageChange();
GroupAlign->languageChange();
-
- if(StyledLine->count() > 0)
- StyledLine->item(0)->setText( tr("No Style") );
textFlowDisabled2->setToolTip( tr("Disable text flow from lower frames around object"));
textFlowUsesFrameShape2->setToolTip( tr("Use the frame shape for text flow of text frames below the object."));
@@ -3066,17 +2533,6 @@
normWordTrackingSpinBox->setToolTip( tr("Normal width of spaces between words"));
minGlyphExtSpinBox->setToolTip( tr("Minimal shrinkage of glyphs for justification"));
maxGlyphExtSpinBox->setToolTip( tr("Maximal extension of glyphs for justification"));
-
- LineMode->setToolTip( tr("Change settings for left or end points"));
- LStyle->setToolTip( tr("Pattern of line"));
- LSize->setToolTip( tr("Thickness of line"));
- LJoinStyle->setToolTip( tr("Type of line joins"));
- LEndStyle->setToolTip( tr("Type of line end"));
- StyledLine->setToolTip( tr("Line style of current object"));
- startArrow->setToolTip( tr("Arrow head style for start of line"));
- endArrow->setToolTip( tr("Arrow head style for end of line"));
- startArrowScaleSpin->setToolTip( tr("Arrow head scale for start of line"));
- endArrowScaleSpin->setToolTip( tr("Arrow head scale for end of line"));
DCol->setToolTip( tr("Number of columns in text frame"));
colgapLabel->setToolTip( tr("Switches between Gap or Column width"));
Modified: branches/ScribusOIF/scribus/ui/propertiespalette.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/ui/propertiespalette.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette.h (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette.h Sun Oct 17 16:57:20 2010
@@ -56,6 +56,7 @@
class FontComboH;
class NameWidget;
class PropertiesPalette_Image;
+class PropertiesPalette_Line;
class PropertiesPalette_Shape;
class PropertiesPalette_XYZ;
class ScComboBox;
@@ -98,6 +99,7 @@
PropertiesPalette_Image* imagePal;
+ PropertiesPalette_Line* linePal;
PropertiesPalette_Shape* shapePal;
PropertiesPalette_XYZ* xyzPal;
Cpalette *Cpal;
@@ -107,11 +109,8 @@
ParaStyleComboBox *paraStyleCombo;
CharStyleComboBox *charStyleCombo;
FontComboH* Fonts;
- ArrowChooser* startArrow;
- ArrowChooser* endArrow;
QGroupBox* textFlowOptions2;
QButtonGroup* textFlowOptionsB2;
- DashEditor* dashEditor;
public slots:
void setMainWindow(ScribusMainWindow *mw);
@@ -133,8 +132,6 @@
void setFontFace(const QString&);
void setExtra(double e);
void setTextToFrameDistances(double left, double top, double bottom, double right);
- void setLineWidth(double s);
- void setLIvalue(Qt::PenStyle p, Qt::PenCapStyle pc, Qt::PenJoinStyle pj);
void setFlop(FirstLineOffsetPolicy);
/// update TB values:
void updateStyle(const ParagraphStyle& newCurrent);
@@ -162,8 +159,6 @@
void NewTBase();
void setTScaleV(double e);
void setTBase(double e);
- void SetLineFormats(ScribusDoc *dd);
- void SetSTline(QListWidgetItem *c);
void NewTFont(QString);
void newTxtFill();
void newTxtStroke();
@@ -181,11 +176,7 @@
void NewGap();
void NewSize();
void NewTracking();
- void NewLineWidth();
- void NewLineStyle();
- void NewLineJoin();
- void NewLineEnd();
- void NewLineMode();
+ void NewLineMode(int mode);
void NewAlignement(int a);
void setTypeStyle(int s);
void newShadowOffs();
@@ -208,17 +199,11 @@
void handlePathOffs();
void handleOverprint(int);
void NewLanguage();
- void HandleTLines();
- void setStartArrow(int id);
- void setEndArrow(int id);
- void setStartArrowScale(int sc);
- void setEndArrowScale(int sc);
void setGroupTransparency(double trans);
void setGroupBlending(int blend);
void setGroupGradMask(int typ);
void setGroupPatternMask(QString pattern);
void setGroupPatternMaskProps(double imageScaleX, double imageScaleY, double offsetX, double offsetY, double rotation, double skewX, double skewY, bool mirrorX, bool mirrorY);
- void dashChange();
void flop(int);
protected slots:
@@ -244,17 +229,14 @@
QVBoxLayout* pageLayout_3;
QVBoxLayout* pageLayout_4;
QVBoxLayout* pageLayout_5;
- QVBoxLayout* pageLayout_5a;
- QVBoxLayout* pageLayout_5b;
QVBoxLayout* pageLayout_6;
QVBoxLayout* pageLayout_7;
- QVBoxLayout* TLineLayout;
+
QGridLayout* layout41;
QGridLayout* layout41a;
QGridLayout* layout41c;
QHBoxLayout* Layout1;
QHBoxLayout* Layout1AL;
- QGridLayout* Layout12_2;
QGridLayout* DistanceLayout;
QGridLayout* DistanceLayout2;
QGridLayout* GroupBox3aLayout;
@@ -268,16 +250,12 @@
QHBoxLayout* glyphExtensionHLayout;
QGridLayout* flopLayout;
QVBoxLayout* OptMarginsLayout;
- QHBoxLayout* Layout12_2a;
- QHBoxLayout* Layout12_2b;
QWidget* page;
QWidget* page_2;
QWidget* page_3;
QWidget* page_4;
QWidget* page_5;
- QWidget* page_5a;
- QWidget* page_5b;
QWidget* page_6;
QWidget* page_7;
QWidget* page_group;
@@ -294,9 +272,6 @@
QLabel* trackingLabel;
QLabel* fontsizeLabel;
QLabel* lineSpacingLabel;
- QLabel* linewidthLabel;
- QLabel* endingsLabel;
- QLabel* linetypeLabel;
QLabel* StrokeIcon;
QLabel* ShadeTxt2;
QLabel* ShadeTxt1;
@@ -304,13 +279,9 @@
QLabel* paraStyleLabel;
QLabel* charStyleLabel;
QLabel* langLabel;
- QLabel* LineModeT;
- QLabel* edgesLabel;
QLabel* ChBaseTxt;
QLabel* ScaleTxt;
QLabel* ScaleTxtV;
- QLabel* startArrowText;
- QLabel* endArrowText;
QLabel* TransTxt;
QLabel* TransTxt2;
QLabel* wordTrackingLabel;
@@ -319,14 +290,10 @@
QLabel* glyphExtensionLabel;
QLabel* minGlyphExtensionLabel;
QLabel* maxGlyphExtensionLabel;
- QLabel* startArrowSpinText;
- QLabel* endArrowSpinText;
ScComboBox* colgapLabel;
StyleSelect* SeStyle;
AlignSelect* GroupAlign;
-
- LineCombo* LStyle;
ShadeButton *PM1;
ShadeButton *PM2;
@@ -336,16 +303,13 @@
ScribusDoc *doc;
double m_unitRatio;
int m_unitIndex;
- bool LMode;
QGroupBox* ShapeGroup2;
QToolButton* TabsButton;
QToolBox* TabStack;
- QStackedWidget* TabStack3;
-
- QGroupBox* TLines;
+
QGroupBox* GroupBox3a;
QGroupBox* TransGroup;
@@ -357,18 +321,11 @@
QCheckBox* flippedPathText;
QCheckBox* showcurveCheckBox;
- QCheckBox* TopLine;
- QCheckBox* LeftLine;
- QCheckBox* RightLine;
- QCheckBox* BottomLine;
ScComboBox* pathTextType;
QComboBox* langCombo;
- QComboBox* LineMode;
QComboBox* lineSpacingModeCombo;
ColorCombo* TxStroke;
- QComboBox* LJoinStyle;
- QComboBox* LEndStyle;
ColorCombo* TxFill;
ScComboBox* blendMode;
QRadioButton *optMarginRadioNone;
@@ -376,8 +333,6 @@
QRadioButton *optMarginRadioLeft;
QRadioButton *optMarginRadioRight;
QPushButton *optMarginResetButton;
-
- QListWidget* StyledLine;
ScrSpinBox* dGap;
ScrSpinBox* DTop;
@@ -389,7 +344,6 @@
ScrSpinBox* Size;
ScrSpinBox* LineSp;
ScrSpinBox* Extra;
- ScrSpinBox* LSize;
ScrSpinBox* ChScale;
ScrSpinBox* ChScaleV;
ScrSpinBox* ChBase;
@@ -399,8 +353,6 @@
ScrSpinBox* maxGlyphExtSpinBox;
QSpinBox* DCol;
QSpinBox* TransSpin;
- QSpinBox* startArrowScaleSpin;
- QSpinBox* endArrowScaleSpin;
QRadioButton* flopRealHeight;
QRadioButton* flopFontAscent;
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_image.cpp Sun Oct 17 16:57:20 2010
@@ -255,9 +255,9 @@
if (e->type() == QEvent::LanguageChange)
{
languageChange();
- }
- else
- QWidget::changeEvent(e);
+ return;
+ }
+ QWidget::changeEvent(e);
}
void PropertiesPalette_Image::setMainWindow(ScribusMainWindow* mw)
Modified: branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp (original)
+++ branches/ScribusOIF/scribus/ui/propertiespalette_xyz.cpp Sun Oct 17 16:57:20 2010
@@ -4,7 +4,6 @@
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
-
#include "propertiespalette_xyz.h"
Modified: branches/ScribusOIF/scribus/ui/smlinestyle.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/scribus/ui/smlinestyle.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/smlinestyle.cpp (original)
+++ branches/ScribusOIF/scribus/ui/smlinestyle.cpp Sun Oct 17 16:57:20 2010
@@ -12,6 +12,7 @@
#include "smlinestylewidget.h"
#include "scribus.h"
#include "propertiespalette.h"
+#include "propertiespalette_line.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
@@ -261,7 +262,7 @@
}
}
doc_->changed();
- doc_->scMW()->propertiesPalette->SetLineFormats(doc_);
+ doc_->scMW()->propertiesPalette->linePal->updateLineStyles();
// Better not call DrawNew() here, as this will cause several unnecessary calls
// doc_->view()->DrawNew();
selectionIsDirty_ = false;
Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15553&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Sun Oct 17 16:57:20 2010
@@ -1499,6 +1499,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\propertiespalette_line.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\propertiespalette_shape.cpp"
>
</File>
@@ -8388,6 +8392,38 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\scribus\ui\propertiespalette_line.h"
+ >
+ <FileConfiguration
+ Name="Debug-cairo|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-cairo|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug-arthur|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release-arthur|Win32"
+ >
+ <Tool
+ Name="moc.exe"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\scribus\ui\propertiespalette_shape.h"
>
<FileConfiguration
@@ -13058,6 +13094,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\moc_propertiespalette_line.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\moc_propertiespalette_shape.cpp"
>
</File>
More information about the scribus-commit
mailing list