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

resources/sankore.qrc

@@ -322,5 +322,9 @@
         <file>style.qss</file>
         <file>images/cache_circle.png</file>
         <file>images/cache_square.png</file>
+        <file>images/down_arrow.png</file>
+        <file>images/up_arrow.png</file>
+        <file>images/left_arrow.png</file>
+        <file>images/right_arrow.png</file>
     </qresource>
 </RCC>

resources/style.qss

@@ -1,8 +1,12 @@
-QWidget#DockPaletteWidgetBox, QWidget#documentNavigator
+QWidget#DockPaletteWidgetBox,
+QWidget#documentNavigator,
+QWidget#UBLibraryWidget,
+QWidget#UBLibPathViewer
 {
 	background: #EEEEEE;
 	border-radius: 10px;
 	border: 2px solid #999999;
+/*	padding-bottom: -2px; */
 }
 
 QColorDialog
@@ -32,6 +36,95 @@ QPushButton#DockPaletteWidgetButton::checked
 	background-color: #BBBBBB;
 }
 
+QScrollBar::vertical
+{
+	background:transparent;
+	margin: 23px 1px 25px 1px;
+}
+
+QScrollBar::handle:vertical
+{
+	border: 2px solid #999999;
+	border-radius:6px;
+	background:#BBBBBB;
+	min-height:40px;
+}
+
+QScrollBar::add-line:vertical
+{
+	image:url(:/images/down_arrow.png);
+	height:16px;
+	background:#BBBBBB;
+	border:2px solid #999999;
+	border-radius:6px;
+	margin: 1px 1px 4px 1px;
+	subcontrol-position:bottom;
+	subcontrol-origin:margin;
+}
+
+QScrollBar::sub-line:vertical
+{
+	image:url(:/images/up_arrow.png);
+	height:16px;
+	background:#BBBBBB;
+	border:2px solid #999999;
+	border-radius:6px;
+	margin: 2px 1px 1px 1px;
+	subcontrol-position:top;
+	subcontrol-origin:margin;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
+{
+	background:transparent;
+}
+
+
+
+QScrollBar::horizontal
+{
+	background:transparent;
+	margin: 1px 23px 1px 25px;
+}
+
+QScrollBar::handle:horizontal
+{
+	border: 2px solid #999999;
+	border-radius:6px;
+	background:#BBBBBB;
+	min-width:40px;
+}
+
+QScrollBar::add-line:horizontal
+{
+	image:url(:/images/right_arrow.png);
+	width:16px;
+	background:#BBBBBB;
+	border:2px solid #999999;
+	border-radius:6px;
+	margin: 1px 1px 1px 4px;
+	subcontrol-position:right;
+	subcontrol-origin:margin;
+}
+
+QScrollBar::sub-line:horizontal
+{
+	image:url(:/images/left_arrow.png);
+	width:16px;
+	background:#BBBBBB;
+	border:2px solid #999999;
+	border-radius:6px;
+	margin: 1px 2px 1px 1px;
+	subcontrol-position:left;
+	subcontrol-origin:margin;
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal
+{
+	background:transparent;
+}
+
+
 QSlider::handle::horizontal
 {
 	background-color:#EEEEEE;

src/desktop/UBDesktopAnnotationController.cpp

@@ -433,7 +433,10 @@ void UBDesktopAnnotationController::customCapture()
     UBCustomCaptureWindow customCaptureWindow(mDesktopPalette);
 
     // need to show the window before execute it to avoid some glitch on windows.
+
+#ifndef Q_WS_WIN // Working only without this call on win32 desktop mode
     customCaptureWindow.show();
+#endif
 
     if (customCaptureWindow.execute(getScreenPixmap()) == QDialog::Accepted)
     {

src/gui/UBDocumentNavigator.cpp

@@ -51,6 +51,8 @@ UBDocumentNavigator::UBDocumentNavigator(QWidget *parent, const char *name):QGra
     setScene(mScene);
     mThumbnailWidth = width() - 2*border();
 
+    setFrameShadow(QFrame::Plain);
+
     connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(addNewPage()));
     connect(UBApplication::boardController, SIGNAL(setDocOnPageNavigator(UBDocumentProxy*)), this, SLOT(generateThumbnails()));
     connect(mScene, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));

src/gui/UBLibNavigatorWidget.cpp

@@ -50,7 +50,6 @@ UBLibNavigatorWidget::UBLibNavigatorWidget(QWidget *parent, const char *name):QW
 
     mSlider = new QSlider(Qt::Horizontal, this);
     mSlider->setMinimumHeight(20);
-    mSlider->setStyleSheet(QString("QSlider::handle::horizontal{background-color:#EEEEEE; margin-top:-5px; margin-bottom:-5px; height:20px; width:18px; border-radius:10px; border:1px solid #555555;} QSlider::groove::horizontal{background-color:#999999; height:10px; border-radius:5px; border:1px solid #555555;}"));
     mSlider->setRange(lowBoundForSlider, topBoundForSlider);
     mSliderWidthSetting = new UBSetting(UBSettings::settings(), "Library", "LibWidgetWidth", topBoundForSlider);
     int defaultWidth = mSliderWidthSetting->get().toInt();

src/gui/UBLibPathViewer.cpp

@@ -37,7 +37,6 @@ UBLibPathViewer::UBLibPathViewer(QWidget *parent, const char *name):QGraphicsVie
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     setAcceptDrops(true);
-    setStyleSheet(QString("QGraphicsView{background:#EEEEEE; border-radius:10px; border:2px solid #999999;}"));
 
     mpScene = new UBPathScene(this);
     setScene(mpScene);

src/gui/UBLibWidget.cpp

@@ -16,6 +16,7 @@
 
 #include "UBLibWidget.h"
 #include "core/memcheck.h"
+#include "core/UBApplication.h"
 
 /**
  * \brief Constructor
@@ -31,6 +32,10 @@ UBLibWidget::UBLibWidget(QWidget *parent, const char *name):UBDockPaletteWidget(
 {
     setObjectName(name);
     mName = "LibWidget";
+
+    setAttribute(Qt::WA_StyledBackground, true);
+    setStyleSheet(UBApplication::globalStyleSheet());
+
     mIconToLeft = QPixmap(":images/library_open.png");
     mIconToRight = QPixmap(":images/library_close.png");
     setAcceptDrops(true);

src/gui/UBLibraryWidget.cpp

@@ -37,7 +37,6 @@ UBLibraryWidget::UBLibraryWidget(QWidget *parent, const char *name):UBThumbnailW
 {
     setObjectName(name);
     setSpacing(5);
-    setStyleSheet(QString("background: #EEEEEE; border-radius : 10px; border : 2px solid #999999;"));
     mLibraryController = new UBLibraryController(parentWidget());
 }