Merge branch 'master' of github.com:Sankore/Sankore-3.1

preferencesAboutTextFull
Claudio Valerio 13 years ago
commit 4d6b9f7613
  1. 10
      src/adaptors/UBSvgSubsetAdaptor.cpp
  2. 7
      src/gui/UBCachePropertiesWidget.cpp
  3. 1
      src/gui/UBPageNavigationWidget.cpp

@ -811,11 +811,11 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
scene->setModified(false);
}
if (annotationGroup)
{
if (annotationGroup->polygons().empty())
delete annotationGroup;
}
if (annotationGroup)
{
if (annotationGroup->polygons().empty())
delete annotationGroup;
}
return scene;
}

@ -61,8 +61,6 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
mpColorLabel = new QLabel(tr("Color:"), mpProperties);
mpColor = new QPushButton(mpProperties);
mpColor->setObjectName("DockPaletteWidgetButton");
// TODO: Check in the document if the page has a color and assign it to this cache
// else set the black color by default
updateCacheColor(Qt::black);
mpColorLayout->addWidget(mpColorLabel, 0);
mpColorLayout->addWidget(mpColor, 0);
@ -86,7 +84,6 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
mpShapeLayout->addStretch(1);
mpPropertiesLayout->addLayout(mpShapeLayout, 0);
// TODO: Check in the document which shape is saved and check the corresponding button
mpCircleButton->setChecked(true);
// Shape Size
@ -111,6 +108,9 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na
// Fill the empty space
mpPropertiesLayout->addStretch(1);
// Get the infos from the current cache
// ...
// Connect signals / slots
connect(mpCloseButton, SIGNAL(clicked()), this, SLOT(onCloseClicked()));
connect(mpColor, SIGNAL(clicked()), this, SLOT(onColorClicked()));
@ -277,6 +277,7 @@ void UBCachePropertiesWidget::updateCurrentCache()
{
if("Cache" == it->data(Qt::UserRole).toString())
{
qDebug() << ">>> Setting cache parameters";
setEnabled(true);
mpCurrentCache = dynamic_cast<UBGraphicsCache*>(it);
if((NULL != mpCurrentCache) && (!mCaches.contains(mpCurrentCache)))

@ -113,6 +113,7 @@ void UBPageNavigationWidget::setDocument(UBDocumentProxy *document)
if(mNavigator->currentDoc() != document)
{
mNavigator->setDocument(document);
UBApplication::boardController->notifyPageChanged();
}
}

Loading…
Cancel
Save