diff --git a/resources/images/libpalette/FlashCategory.svg b/resources/images/libpalette/FlashCategory.svg new file mode 100644 index 00000000..502fc7b2 --- /dev/null +++ b/resources/images/libpalette/FlashCategory.svg @@ -0,0 +1,106 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/libpalette/FlashIcon.svg b/resources/images/libpalette/FlashIcon.svg new file mode 100644 index 00000000..4a075206 --- /dev/null +++ b/resources/images/libpalette/FlashIcon.svg @@ -0,0 +1,89 @@ + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/library_close.png b/resources/images/library_close.png new file mode 100644 index 00000000..0e744056 Binary files /dev/null and b/resources/images/library_close.png differ diff --git a/resources/images/library_open.png b/resources/images/library_open.png new file mode 100644 index 00000000..7529ab02 Binary files /dev/null and b/resources/images/library_open.png differ diff --git a/resources/images/pages_close.png b/resources/images/pages_close.png new file mode 100644 index 00000000..482fe036 Binary files /dev/null and b/resources/images/pages_close.png differ diff --git a/resources/images/pages_open.png b/resources/images/pages_open.png new file mode 100644 index 00000000..9fef5b4a Binary files /dev/null and b/resources/images/pages_open.png differ diff --git a/resources/images/toolbar/stylusTab.png b/resources/images/toolbar/stylusTab.png index a0a78e38..5e2764fe 100644 Binary files a/resources/images/toolbar/stylusTab.png and b/resources/images/toolbar/stylusTab.png differ diff --git a/resources/sankore.qrc b/resources/sankore.qrc index 6c721712..af062959 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -176,7 +176,7 @@ images/cursors/rotate.png images/cursors/resize.png images/cursors/drawCompass.png - images/cursors/drawRulerLine.png + images/cursors/drawRulerLine.png images/print/onepage.png images/print/thumbnails.png images/print/twopages.png @@ -203,7 +203,6 @@ images/toolbar/tutorial.png images/edit-mode.svg images/save.svg - images/toolbar/stylusTab.png images/libpalette/social.png images/navig_arrow.png images/flags/ar.png @@ -289,8 +288,6 @@ images/toolbar/hide.png images/toolbar/record.png images/libpalette/MoviesCategory.svg - - images/virtual.keyboard/41/centre-passive.png images/virtual.keyboard/41/left-passive.png images/virtual.keyboard/41/right-passive.png @@ -300,7 +297,6 @@ images/virtual.keyboard/41/backspace.png images/virtual.keyboard/41/capslock.png images/virtual.keyboard/41/tab.png - images/virtual.keyboard/29/centre-passive.png images/virtual.keyboard/29/left-passive.png images/virtual.keyboard/29/right-passive.png @@ -310,6 +306,12 @@ images/virtual.keyboard/29/backspace.png images/virtual.keyboard/29/capslock.png images/virtual.keyboard/29/tab.png - + images/libpalette/FlashCategory.svg + images/libpalette/FlashIcon.svg + images/toolbar/stylusTab.png + images/library_close.png + images/library_open.png + images/pages_close.png + images/pages_open.png diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index df0fba1e..4aed8c49 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -245,7 +245,7 @@ QList UBLibraryController::rootCategoriesList() element->setMoveable(false); categories << element; - categoryImage = new QImage(":images/libpalette/InteractivesCategory.svg"); + categoryImage = new QImage(":images/libpalette/FlashCategory.svg"); element = new UBLibElement(eUBLibElementType_Folder, mAnimationUserDirectoryPath, tr("Animations", "Animations category element")); element->setThumbnail(categoryImage); element->setMoveable(false); diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index 49fbddd6..1b37e1de 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -330,7 +330,14 @@ void UBDockPalette::paintEvent(QPaintEvent *event) path.addRect(0.0, 0.0, width()-2*border(), height()); path.addRoundedRect(width()-4*border(), mHTab, 4*border(), TABSIZE, radius(), radius()); painter.drawPath(path); - painter.drawPixmap(width() - border() + 1, mHTab + 1 , border() - 4, TABSIZE - 2, mIcon); + if(mCollapseWidth >= width()) + { + painter.drawPixmap(width() - 2*border() + 1, mHTab + 1 , 2*border() - 4, TABSIZE - 2, mCollapsedIcon); + } + else + { + painter.drawPixmap(width() - 2*border() + 1, mHTab + 1 , 2*border() - 4, TABSIZE - 2, mIcon); + } } else if(mOrientation == eUBDockOrientation_Right) { @@ -339,7 +346,14 @@ void UBDockPalette::paintEvent(QPaintEvent *event) path.addRect(2*border(), 0.0, width()-2*border(), height()); path.addRoundedRect(0.0, mHTab, 4*border(), TABSIZE, radius(), radius()); painter.drawPath(path); - painter.drawPixmap(2, mHTab + 1, border() - 3, TABSIZE - 2, mIcon); + if(width() <= mCollapseWidth) + { + painter.drawPixmap(2, mHTab + 1, 2*border() - 3, TABSIZE - 2, mCollapsedIcon); + } + else + { + painter.drawPixmap(2, mHTab + 1, 2*border() - 3, TABSIZE - 2, mIcon); + } } else { diff --git a/src/gui/UBDockPalette.h b/src/gui/UBDockPalette.h index 17440662..02fd32c2 100644 --- a/src/gui/UBDockPalette.h +++ b/src/gui/UBDockPalette.h @@ -95,6 +95,7 @@ protected: QPoint mMousePressPos; /** The palette icon */ QPixmap mIcon; + QPixmap mCollapsedIcon; /** The tab orientation */ eUBDockTabOrientation mTabsOrientation; /** The h position of the tab */ diff --git a/src/gui/UBLibPalette.cpp b/src/gui/UBLibPalette.cpp index fb5c9a1f..da9bb420 100644 --- a/src/gui/UBLibPalette.cpp +++ b/src/gui/UBLibPalette.cpp @@ -31,7 +31,9 @@ UBLibPalette::UBLibPalette(QWidget *parent, const char *name):UBDockPalette(pare , mDropWidget(NULL) { setOrientation(eUBDockOrientation_Right); - mIcon = QPixmap(":images/paletteLibrary.png"); + //mIcon = QPixmap(":images/paletteLibrary.png"); + mCollapsedIcon = QPixmap(":images/library_open.png"); + mIcon = QPixmap(":images/library_close.png"); setAcceptDrops(true); resize(UBSettings::settings()->libPaletteWidth->get().toInt(), parentWidget()->height()); diff --git a/src/gui/UBNavigatorPalette.cpp b/src/gui/UBNavigatorPalette.cpp index 8ac69e5e..3e035ae3 100644 --- a/src/gui/UBNavigatorPalette.cpp +++ b/src/gui/UBNavigatorPalette.cpp @@ -32,7 +32,9 @@ UBNavigatorPalette::UBNavigatorPalette(QWidget *parent, const char *name):UBDock { setOrientation(eUBDockOrientation_Left); setMaximumWidth(300); - mIcon = QPixmap(":images/paletteNavigator.png"); + //mIcon = QPixmap(":images/paletteNavigator.png"); + mCollapsedIcon = QPixmap(":images/pages_open.png"); + mIcon = QPixmap(":images/pages_close.png"); resize(UBSettings::settings()->navigPaletteWidth->get().toInt(), height()); mLastWidth = 300;