added setting element as background

preferencesAboutTextFull
Anna Udovichenko 13 years ago
parent 56c8bfc3d1
commit bfd74d2247
  1. 14
      src/board/UBFeaturesController.cpp
  2. 3
      src/board/UBFeaturesController.h
  3. 25
      src/gui/UBFeaturesWidget.cpp
  4. 2
      src/gui/UBFeaturesWidget.h

@ -359,16 +359,14 @@ UBFeature UBFeaturesController::newFolder( const QString &name )
void UBFeaturesController::addItemToPage(const UBFeature &item) void UBFeaturesController::addItemToPage(const UBFeature &item)
{ {
UBApplication::boardController->downloadURL( item.getFullPath() ); UBApplication::boardController->downloadURL( item.getFullPath() );
/*if ( item.getType() == FEATURE_INTERNAL )
{
UBApplication::boardController->downloadURL( QUrl( item.getFullPath() ) );
}
else
{
UBApplication::boardController->downloadURL( QUrl::fromLocalFile( item.getFullPath() ) );
}*/
} }
void UBFeaturesController::addItemAsBackground(const UBFeature &item)
{
UBApplication::boardController->downloadURL( item.getFullPath(), QPointF(), QSize(), true );
}
UBFeature UBFeaturesController::getDestinationForItem( const QUrl &url ) UBFeature UBFeaturesController::getDestinationForItem( const QUrl &url )
{ {
QString mimetype = UBFileSystemUtils::mimeTypeFromFileName( fileNameFromUrl(url) ); QString mimetype = UBFileSystemUtils::mimeTypeFromFileName( fileNameFromUrl(url) );

@ -70,7 +70,8 @@ public:
const QString& getRootPath()const { return rootPath; } const QString& getRootPath()const { return rootPath; }
void addItemToPage(const UBFeature &item); void addItemToPage( const UBFeature &item );
void addItemAsBackground( const UBFeature &item );
const UBFeature& getCurrentElement()const { return currentElement; } const UBFeature& getCurrentElement()const { return currentElement; }
void setCurrentElement( const UBFeature &elem ) { currentElement = elem; } void setCurrentElement( const UBFeature &elem ) { currentElement = elem; }
const UBFeature & getTrashElement () const { return trashElement; } const UBFeature & getTrashElement () const { return trashElement; }

@ -555,7 +555,8 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) :
mpObjInfos->setStyleSheet("background:white;"); mpObjInfos->setStyleSheet("background:white;");
mpLayout->addWidget(mpObjInfos, 1); mpLayout->addWidget(mpObjInfos, 1);
connect(mpAddPageButton, SIGNAL(clicked()), this, SLOT(onAddToPage())); connect( mpAddPageButton, SIGNAL(clicked()), this, SLOT(onAddToPage()) );
connect( mpSetAsBackgroundButton, SIGNAL( clicked() ), this, SLOT( onSetAsBackground() ) );
} }
@ -626,22 +627,13 @@ void UBFeatureProperties::onAddToPage()
QWidget *w = parentWidget()->parentWidget(); QWidget *w = parentWidget()->parentWidget();
UBFeaturesWidget* featuresWidget = dynamic_cast<UBFeaturesWidget*>( w ); UBFeaturesWidget* featuresWidget = dynamic_cast<UBFeaturesWidget*>( w );
featuresWidget->getFeaturesController()->addItemToPage( *mpElement ); featuresWidget->getFeaturesController()->addItemToPage( *mpElement );
/*if ( UBApplication::isFromWeb( mpElement->getVirtualPath() ) ) }
{
sDownloadFileDesc desc;
desc.isBackground = false;
desc.modal = true;
desc.name = QFileInfo( mpElement->getName() ).fileName();
desc.url = mpElement->getVirtualPath();
UBDownloadManager::downloadManager()->addFileToDownload(desc);
} void UBFeatureProperties::onSetAsBackground()
else {
{
QWidget *w = parentWidget()->parentWidget(); QWidget *w = parentWidget()->parentWidget();
UBFeaturesWidget* featuresWidget = dynamic_cast<UBFeaturesWidget*>( w ); UBFeaturesWidget* featuresWidget = dynamic_cast<UBFeaturesWidget*>( w );
featuresWidget->getFeaturesController()->addItemToPage( *mpElement ); featuresWidget->getFeaturesController()->addItemAsBackground( *mpElement );
}*/
} }
UBFeatureProperties::~UBFeatureProperties() UBFeatureProperties::~UBFeatureProperties()
@ -704,14 +696,15 @@ QMimeData* UBFeaturesModel::mimeData(const QModelIndexList &indexes) const
if ( index.isValid() ) if ( index.isValid() )
{ {
UBFeature element = data( index, Qt::UserRole + 1 ).value<UBFeature>(); UBFeature element = data( index, Qt::UserRole + 1 ).value<UBFeature>();
if ( element.getType() == FEATURE_INTERNAL ) urlList.push_back( element.getFullPath() );
/*if ( element.getType() == FEATURE_INTERNAL )
{ {
urlList.push_back( QUrl( element.getFullPath() ) ); urlList.push_back( QUrl( element.getFullPath() ) );
} }
else if ( element.getType() == FEATURE_INTERACTIVE || element.getType() == FEATURE_ITEM ) else if ( element.getType() == FEATURE_INTERACTIVE || element.getType() == FEATURE_ITEM )
{ {
urlList.push_back( element.getFullPath() ); urlList.push_back( element.getFullPath() );
} }*/
} }
} }
mimeData->setUrls( urlList ); mimeData->setUrls( urlList );

@ -157,7 +157,7 @@ protected:
private slots: private slots:
void onAddToPage(); void onAddToPage();
//void onAddToLib(); //void onAddToLib();
//void onSetAsBackground(); void onSetAsBackground();
//void onBack(); //void onBack();
private: private:

Loading…
Cancel
Save