From 245e5cc44d46e94165814578a1c81ea69c9cef8c Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 25 Aug 2011 17:00:25 +0200 Subject: [PATCH 01/11] Added new icons --- resources/images/libpalette/FlashCategory.svg | 106 ++++++++++++++++++ resources/images/libpalette/FlashIcon.svg | 89 +++++++++++++++ resources/images/library_close.png | Bin 0 -> 1667 bytes resources/images/library_open.png | Bin 0 -> 1673 bytes resources/images/pages_close.png | Bin 0 -> 1336 bytes resources/images/pages_open.png | Bin 0 -> 1325 bytes resources/images/toolbar/stylusTab.png | Bin 2133 -> 3202 bytes resources/sankore.qrc | 14 ++- src/board/UBLibraryController.cpp | 2 +- src/gui/UBDockPalette.cpp | 18 ++- src/gui/UBDockPalette.h | 1 + src/gui/UBLibPalette.cpp | 4 +- src/gui/UBNavigatorPalette.cpp | 4 +- 13 files changed, 227 insertions(+), 11 deletions(-) create mode 100644 resources/images/libpalette/FlashCategory.svg create mode 100644 resources/images/libpalette/FlashIcon.svg create mode 100644 resources/images/library_close.png create mode 100644 resources/images/library_open.png create mode 100644 resources/images/pages_close.png create mode 100644 resources/images/pages_open.png 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 0000000000000000000000000000000000000000..0e744056d8cdf59749e542d40d24ce77c0234b6a GIT binary patch literal 1667 zcmeAS@N?(olHy`uVBq!ia0vp^B0#Lc!3HG%8Q!`Lq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1Ffc1+hD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%fti7VnW3Jc zv5C34xsHO7fuVuEfswwUk*=Y+m9dePfq?=PC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR zmzV368|&p4rRy77T3Uk4Ff!5ws?aU2%qvN((9J7WhMC}!TAW;zSx}OhpQivaF)=B> zw8T~k=u(Imatq+b<`qMO2^e7d6^RAATTy^0&S>2Je*1s( z_h)t5dwTo#Te&TtUGn8(V5`vCIgN9dTwWqLAxmZP8XW`H8J?SU3`B2CKQGvQ)Qjy| zs5lRsq0JwTMu!C%330|VeYkoY|JLm=DzFz3A2D90`w{Iui`(;{#mJYJFliw`)WBwrPPKe9~qpe(a zCJTF%AAN}v43VDkqoew>;NJsVUn-Vtal3f)oAkw{oGpLss{O&svPUuf+|~zY)~2egShwm}>iJ5ZJ^y-czpu~O?pu;AR>RA0?0)qI zzs2O;xyEMyMJHTZu|0ZAW4+5fwtwD7^R}n{l<(WiaH-H{=Y_r~y@k9n5t9yl-ralh zqPo=G#^BN-nHpWaFWb!&B+u_XX7NjUYIo)vjg5yU_D#Llp0;Ub>_eV4mnKC&Y&y`z zC1)Q#@6p@Y(w6(AHnY6myn2Oi%NG6ixhJe^X4S4)voEmFH>h1si@G zsg;V37ZbS6=ji3N#Y->8EA8!~8?AaJC2^+%SJbRoB>DPnGl%sqh4p78UpwFZu6X`) zn?sfjbK6a)NlPXz)ag6A`as~;eUql7xNm)N@KJk`w l0UFkP%U?(sa{bdjz@Yn0Vq@>Z7Y?9m!PC{xWt~$(697y@hb{mB literal 0 HcmV?d00001 diff --git a/resources/images/library_open.png b/resources/images/library_open.png new file mode 100644 index 0000000000000000000000000000000000000000..7529ab02e8431c636e4b4fc0e7b610aa79a96d56 GIT binary patch literal 1673 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 rT+SS-XX;{k(R#%8pq;@-bP0l+XkK3s&CZ literal 0 HcmV?d00001 diff --git a/resources/images/toolbar/stylusTab.png b/resources/images/toolbar/stylusTab.png index a0a78e3898d507003f63a53c3f01cf649d6684c1..5e2764fe8c88d4b5c4cd98f833377f8b184278e7 100644 GIT binary patch delta 3171 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 zs_?5images/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; From da6a31a3a2222975e3da7f5e6fabf6d8f3d72221 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 25 Aug 2011 18:32:22 +0300 Subject: [PATCH 02/11] changed GraphMe --- .../interactive/Graphme.wgt/Grapheur.xhtml | 186 ++++++- .../JavaScript/jQuery/DD_roundies_0.0.2a.js | 472 ++++++++++++++++ .../JavaScript/jQuery/calculate.js | 74 +++ .../JavaScript/jQuery/jquery-1.3.2.min.js | 19 + .../jQuery/jquery-ui-1.7.2.custom.min.js | 298 ++++++++++ .../JavaScript/jQuery/jquery.center.js | 56 ++ .../jQuery/jquery.disable.text.select.js | 62 +++ .../JavaScript/jQuery/jquery.easing.1.2.js | 140 +++++ .../JavaScript/jQuery/jquery.ubwidget.js | 259 +++++++++ .../Graphme.wgt/JavaScript/jQuery/ubw-main.js | 526 ++++++++++++++++++ .../JavaScript/jquery-1.3.2.min.js | 19 + .../JavaScript/jquery.disable.text.select.js | 62 +++ 12 files changed, 2160 insertions(+), 13 deletions(-) create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jQuery/DD_roundies_0.0.2a.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jQuery/calculate.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jQuery/jquery-1.3.2.min.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jQuery/jquery-ui-1.7.2.custom.min.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jQuery/jquery.center.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jQuery/jquery.disable.text.select.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jQuery/jquery.easing.1.2.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jQuery/jquery.ubwidget.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jQuery/ubw-main.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jquery-1.3.2.min.js create mode 100644 resources/library/interactive/Graphme.wgt/JavaScript/jquery.disable.text.select.js diff --git a/resources/library/interactive/Graphme.wgt/Grapheur.xhtml b/resources/library/interactive/Graphme.wgt/Grapheur.xhtml index 44f3b420..1caf99c6 100644 --- a/resources/library/interactive/Graphme.wgt/Grapheur.xhtml +++ b/resources/library/interactive/Graphme.wgt/Grapheur.xhtml @@ -23,18 +23,7 @@