Sankore css text color fix

preferencesAboutTextFull
Ilia Ryabokon 12 years ago
parent 6f6c3e78ba
commit 2fb1db5a44
  1. 5
      resources/etc/Uniboard.css
  2. 33
      src/board/UBFeaturesController.cpp
  3. 2
      src/board/UBFeaturesController.h
  4. 31
      src/gui/UBFeaturesWidget.cpp

@ -1,4 +1,9 @@
*
{
color: #3F3F3F;
}
QMainWindow QMainWindow
{ {
background-color: #F1F1F1; background-color: #F1F1F1;
} }

@ -25,7 +25,6 @@ const QString UBFeaturesController::virtualRootName = "root";
UBFeature::UBFeature(const QString &url, const QPixmap &icon, const QString &name, const QUrl &realPath, UBFeatureElementType type) UBFeature::UBFeature(const QString &url, const QPixmap &icon, const QString &name, const QUrl &realPath, UBFeatureElementType type)
: virtualDir(url), mThumbnail(icon), mName(name), mPath(realPath), elementType(type) : virtualDir(url), mThumbnail(icon), mName(name), mPath(realPath), elementType(type)
{ {
} }
UBFeature::~UBFeature() UBFeature::~UBFeature()
@ -43,8 +42,7 @@ QString UBFeature::getUrl() const
{ {
if ( elementType == FEATURE_INTERNAL ) if ( elementType == FEATURE_INTERNAL )
return getFullPath().toString(); return getFullPath().toString();
/*if ( UBApplication::isFromWeb( getFullPath() ) )
return QUrl( getFullPath() );*/
return getFullPath().toLocalFile(); return getFullPath().toLocalFile();
} }
@ -185,28 +183,6 @@ void UBFeaturesController::scanFS()
fileSystemScan( mLibInteractiveDirectoryPath, interactPath); fileSystemScan( mLibInteractiveDirectoryPath, interactPath);
fileSystemScan( trashDirectoryPath, trashPath); fileSystemScan( trashDirectoryPath, trashPath);
fileSystemScan( mLibSearchDirectoryPath, rootPath + "/" + "Web search"); fileSystemScan( mLibSearchDirectoryPath, rootPath + "/" + "Web search");
//=======
// // Claudio:
// // don't change the order of the scans
// fileSystemScan( mLibAudiosDirectoryPath, audiosPath);
// fileSystemScan( mLibVideosDirectoryPath, moviesPath);
// fileSystemScan( mLibAnimationsDirectoryPath, flashPath);
// fileSystemScan( mLibPicturesDirectoryPath, picturesPath );
// fileSystemScan( mUserInteractiveDirectoryPath, appPath );
// fileSystemScan( mUserAudioDirectoryPath, audiosPath );
// fileSystemScan( mUserPicturesDirectoryPath, picturesPath );
// fileSystemScan( mUserVideoDirectoryPath, moviesPath );
// fileSystemScan( mUserAnimationDirectoryPath, flashPath );
// fileSystemScan( mLibApplicationsDirectoryPath, appPath );
// fileSystemScan( mLibShapesDirectoryPath, shapesPath );
// fileSystemScan( mLibInteractiveDirectoryPath, interactPath );
// fileSystemScan( trashDirectoryPath, trashPath );
// fileSystemScan( mLibSearchDirectoryPath, rootPath + "/" + "Web search" );
//>>>>>>> e38b24544e8b8b1d5bd41dabdeaf588df7d45185
} }
void UBFeaturesController::fileSystemScan(const QUrl & currentPath, const QString & currVirtualPath) void UBFeaturesController::fileSystemScan(const QUrl & currentPath, const QString & currVirtualPath)
@ -287,12 +263,7 @@ void UBFeaturesController::loadFavoriteList()
{ {
QUrl path; QUrl path;
in >> path; in >> path;
/*QFileInfo fileInfo( path ); favoriteSet->insert( path );
QString fileName = fileInfo.fileName();
UBFeature elem( favoritePath, thumbnailForFile( path ), fileName, path, fileTypeFromUrl(path) );
featuresList->append( elem );*/
favoriteSet->insert( path );
} }
} }
} }

@ -55,8 +55,6 @@ public:
void setFullVirtualPath(const QString &newVirtualPath) {virtualDir = newVirtualPath;} void setFullVirtualPath(const QString &newVirtualPath) {virtualDir = newVirtualPath;}
UBFeatureElementType getType() const { return elementType; } UBFeatureElementType getType() const { return elementType; }
bool isFolder() const; bool isFolder() const;
bool isDeletable() const; bool isDeletable() const;
bool inTrash() const; bool inTrash() const;

@ -507,32 +507,6 @@ UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* name )
setObjectName(name); setObjectName(name);
} }
/*
void UBFeaturesListView::mousePressEvent( QMouseEvent *event )
{
rubberOrigin = event->pos();
rubberBand->setGeometry( QRect( rubberOrigin, QSize() ) );
//qDebug() << rubberOrigin.x() << rubberOrigin.y();
rubberBand->show();
QListView::mousePressEvent(event);
}
void UBFeaturesListView::mouseMoveEvent( QMouseEvent *event )
{
QPoint current = event->pos();
rubberBand->setGeometry( QRect( rubberOrigin, current ).normalized() );
//setSelection( rubberBand->rect(), QItemSelectionModel::Select );
QListView::mouseMoveEvent(event);
}
void UBFeaturesListView::mouseReleaseEvent( QMouseEvent *event )
{
rubberBand->hide();
QListView::mouseReleaseEvent(event);
}
*/
void UBFeaturesListView::dragEnterEvent( QDragEnterEvent *event ) void UBFeaturesListView::dragEnterEvent( QDragEnterEvent *event )
{ {
if ( event->mimeData()->hasUrls() || event->mimeData()->hasImage() ) if ( event->mimeData()->hasUrls() || event->mimeData()->hasImage() )
@ -580,9 +554,7 @@ UBFeaturesNavigatorWidget::UBFeaturesNavigatorWidget(QWidget *parent, const char
QWidget(parent), mListView(0), mListSlder(0) QWidget(parent), mListView(0), mListSlder(0)
{ {
// if ('\0' == name) { name = "UBFeaturesNavigatorWidget";
name = "UBFeaturesNavigatorWidget";
// }
setObjectName(name); setObjectName(name);
SET_STYLE_SHEET() SET_STYLE_SHEET()
@ -719,7 +691,6 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) :
setObjectName(name); setObjectName(name);
SET_STYLE_SHEET(); SET_STYLE_SHEET();
//setStyleSheet(UBApplication::globalStyleSheet());
// Create the GUI // Create the GUI
mpLayout = new QVBoxLayout(this); mpLayout = new QVBoxLayout(this);

Loading…
Cancel
Save