Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
2fb1db5a
Commit
2fb1db5a
authored
Jul 31, 2012
by
Ilia Ryabokon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sankore css text color fix
parent
6f6c3e78
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
63 deletions
+8
-63
Uniboard.css
resources/etc/Uniboard.css
+5
-0
UBFeaturesController.cpp
src/board/UBFeaturesController.cpp
+2
-31
UBFeaturesController.h
src/board/UBFeaturesController.h
+0
-2
UBFeaturesWidget.cpp
src/gui/UBFeaturesWidget.cpp
+1
-30
No files found.
resources/etc/Uniboard.css
View file @
2fb1db5a
*
{
color
:
#3F3F3F
;
}
QMainWindow
{
background-color
:
#F1F1F1
;
}
...
...
src/board/UBFeaturesController.cpp
View file @
2fb1db5a
...
...
@@ -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
)
:
virtualDir
(
url
),
mThumbnail
(
icon
),
mName
(
name
),
mPath
(
realPath
),
elementType
(
type
)
{
}
UBFeature
::~
UBFeature
()
...
...
@@ -43,8 +42,7 @@ QString UBFeature::getUrl() const
{
if
(
elementType
==
FEATURE_INTERNAL
)
return
getFullPath
().
toString
();
/*if ( UBApplication::isFromWeb( getFullPath() ) )
return QUrl( getFullPath() );*/
return
getFullPath
().
toLocalFile
();
}
...
...
@@ -185,28 +183,6 @@ void UBFeaturesController::scanFS()
fileSystemScan
(
mLibInteractiveDirectoryPath
,
interactPath
);
fileSystemScan
(
trashDirectoryPath
,
trashPath
);
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
)
...
...
@@ -287,12 +263,7 @@ void UBFeaturesController::loadFavoriteList()
{
QUrl
path
;
in
>>
path
;
/*QFileInfo fileInfo( path );
QString fileName = fileInfo.fileName();
UBFeature elem( favoritePath, thumbnailForFile( path ), fileName, path, fileTypeFromUrl(path) );
featuresList->append( elem );*/
favoriteSet
->
insert
(
path
);
favoriteSet
->
insert
(
path
);
}
}
}
...
...
src/board/UBFeaturesController.h
View file @
2fb1db5a
...
...
@@ -55,8 +55,6 @@ public:
void
setFullVirtualPath
(
const
QString
&
newVirtualPath
)
{
virtualDir
=
newVirtualPath
;}
UBFeatureElementType
getType
()
const
{
return
elementType
;
}
bool
isFolder
()
const
;
bool
isDeletable
()
const
;
bool
inTrash
()
const
;
...
...
src/gui/UBFeaturesWidget.cpp
View file @
2fb1db5a
...
...
@@ -507,32 +507,6 @@ UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* 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
)
{
if
(
event
->
mimeData
()
->
hasUrls
()
||
event
->
mimeData
()
->
hasImage
()
)
...
...
@@ -580,9 +554,7 @@ UBFeaturesNavigatorWidget::UBFeaturesNavigatorWidget(QWidget *parent, const char
QWidget
(
parent
),
mListView
(
0
),
mListSlder
(
0
)
{
// if ('\0' == name) {
name
=
"UBFeaturesNavigatorWidget"
;
// }
name
=
"UBFeaturesNavigatorWidget"
;
setObjectName
(
name
);
SET_STYLE_SHEET
()
...
...
@@ -719,7 +691,6 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) :
setObjectName
(
name
);
SET_STYLE_SHEET
();
//setStyleSheet(UBApplication::globalStyleSheet());
// Create the GUI
mpLayout
=
new
QVBoxLayout
(
this
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment