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
2e049770
Commit
2e049770
authored
Apr 16, 2012
by
Anna Udovichenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UBFeaturesTab added basic functionality partialy implemented
parent
71ca20fe
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
8 deletions
+22
-8
style.qss
resources/style.qss
+9
-1
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+1
-0
UBBoardView.cpp
src/board/UBBoardView.cpp
+2
-1
UBFeaturesWidget.cpp
src/gui/UBFeaturesWidget.cpp
+10
-6
No files found.
resources/style.qss
View file @
2e049770
...
...
@@ -4,7 +4,8 @@ QWidget#UBLibPathViewer,
QWidget#UBLibNavigatorWidget,
QWidget#UBLibItemProperties,
QWidget#UBDownloadWidget,
QWidget#UBTeacherGuideWidget
QWidget#UBTeacherGuideWidget,
QWidget#UBFeatureProperties
{
background: #EEEEEE;
border-radius: 10px;
...
...
@@ -25,6 +26,13 @@ QWidget#UBLibWebView
border: 2px solid #999999;
}
QListView
{
background: #EEEEEE;
border-radius : 10px;
border: 2px solid #999999;
}
QWebView#SearchEngineView
{
background:white;
...
...
src/board/UBBoardPaletteManager.cpp
View file @
2e049770
...
...
@@ -138,6 +138,7 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()
mpDownloadWidget
=
new
UBDockDownloadWidget
();
mpTeacherGuideWidget
=
new
UBDockTeacherGuideWidget
();
mpFeaturesWidget
=
new
UBFeaturesWidget
();
// Add the dock palettes
mLeftPalette
=
new
UBLeftPalette
(
mContainer
);
...
...
src/board/UBBoardView.cpp
View file @
2e049770
...
...
@@ -16,6 +16,7 @@
#include <QtGui>
#include <QtXml>
#include <QListView>
#include "UBDrawingController.h"
...
...
@@ -808,7 +809,7 @@ void UBBoardView::dropEvent (QDropEvent *event)
}
else
if
(
!
event
->
source
()
||
dynamic_cast
<
UBThumbnailWidget
*>
(
event
->
source
())
||
dynamic_cast
<
QWebView
*>
(
event
->
source
())
||
dynamic_cast
<
UBTGMediaWidget
*>
(
event
->
source
())
)
||
dynamic_cast
<
UBTGMediaWidget
*>
(
event
->
source
())
||
dynamic_cast
<
QListView
*>
(
event
->
source
())
)
{
mController
->
processMimeData
(
event
->
mimeData
(),
mapToScene
(
event
->
pos
()));
...
...
src/gui/UBFeaturesWidget.cpp
View file @
2e049770
...
...
@@ -4,6 +4,7 @@
#include "frameworks/UBFileSystemUtils.h"
#include "core/UBApplication.h"
#include "core/UBDownloadManager.h"
#include "globals/UBGlobals.h"
UBFeaturesWidget
::
UBFeaturesWidget
(
QWidget
*
parent
,
const
char
*
name
)
:
UBDockPaletteWidget
(
parent
)
{
...
...
@@ -11,8 +12,9 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale
mName
=
"FeaturesWidget"
;
mVisibleState
=
true
;
setAttribute
(
Qt
::
WA_StyledBackground
,
true
);
setStyleSheet
(
UBApplication
::
globalStyleSheet
());
SET_STYLE_SHEET
();
//setAttribute(Qt::WA_StyledBackground, true);
//setStyleSheet(UBApplication::globalStyleSheet());
mIconToLeft
=
QPixmap
(
":images/library_open.png"
);
mIconToRight
=
QPixmap
(
":images/library_close.png"
);
...
...
@@ -44,6 +46,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale
featuresPathModel
->
setSourceModel
(
featuresModel
);
//featuresListView->setStyleSheet( QString("background: #EEEEEE;border-radius: 10px;border: 2px solid #999999;") );
featuresListView
->
setDragDropMode
(
QAbstractItemView
::
InternalMove
);
featuresListView
->
setModel
(
featuresProxyModel
);
...
...
@@ -55,6 +58,7 @@ UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPale
featuresListView
->
setIconSize
(
QSize
(
40
,
40
)
);
featuresListView
->
setGridSize
(
QSize
(
70
,
70
)
);
//pathListView->setStyleSheet( QString("background: #EEEEEE; border-radius : 10px; border : 2px solid #999999;") );
pathListView
->
setModel
(
featuresPathModel
);
pathListView
->
setViewMode
(
QListView
::
IconMode
);
pathListView
->
setIconSize
(
QSize
(
30
,
30
)
);
...
...
@@ -201,8 +205,8 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) :
{
setObjectName
(
name
);
setAttribute
(
Qt
::
WA_StyledBackground
,
true
);
setStyleSheet
(
UBApplication
::
globalStyleSheet
());
SET_STYLE_SHEET
(
);
//
setStyleSheet(UBApplication::globalStyleSheet());
// Create the GUI
mpLayout
=
new
QVBoxLayout
(
this
);
...
...
@@ -316,9 +320,9 @@ UBFeaturesPathViewer::UBFeaturesPathViewer(const QPixmap &root, const QString &r
{
setObjectName
(
name
);
setAttribute
(
Qt
::
WA_StyledBackground
,
true
);
/*
setAttribute(Qt::WA_StyledBackground, true);
setStyleSheet(UBApplication::globalStyleSheet());
*/
layout
=
new
QGraphicsLinearLayout
();
container
=
new
QGraphicsWidget
();
...
...
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