From e419c0aa650e30a478dd2a84d7bb95e41f09c923 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 4 May 2011 13:42:56 +0200 Subject: [PATCH 1/5] Removed the Share item on the web button --- src/board/UBBoardPaletteManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 3be40a03..24ac7868 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -145,7 +145,7 @@ void UBBoardPaletteManager::setupPalettes() addItemActions << UBApplication::mainWindow->actionAddItemToCurrentPage; addItemActions << UBApplication::mainWindow->actionAddItemToNewPage; addItemActions << UBApplication::mainWindow->actionAddItemToLibrary; - addItemActions << UBApplication::mainWindow->actionShareItemOnWeb; + //addItemActions << UBApplication::mainWindow->actionShareItemOnWeb; mAddItemPalette = new UBActionPalette(addItemActions, Qt::Horizontal, 0); mAddItemPalette->setButtonIconSize(QSize(128, 128)); @@ -299,7 +299,7 @@ void UBBoardPaletteManager::connectPalettes() connect(UBApplication::mainWindow->actionAddItemToCurrentPage, SIGNAL(triggered()), this, SLOT(addItemToCurrentPage())); connect(UBApplication::mainWindow->actionAddItemToNewPage, SIGNAL(triggered()), this, SLOT(addItemToNewPage())); connect(UBApplication::mainWindow->actionAddItemToLibrary, SIGNAL(triggered()), this, SLOT(addItemToLibrary())); - connect(UBApplication::mainWindow->actionShareItemOnWeb, SIGNAL(triggered()), this, SLOT(shareItemOnWeb())); + //connect(UBApplication::mainWindow->actionShareItemOnWeb, SIGNAL(triggered()), this, SLOT(shareItemOnWeb())); connect(UBApplication::mainWindow->actionEraseItems, SIGNAL(triggered()), mErasePalette, SLOT(close())); connect(UBApplication::mainWindow->actionEraseAnnotations, SIGNAL(triggered()), mErasePalette, SLOT(close())); From ab1abf16131f865c525acea721fe2cf638f1df95 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 May 2011 10:53:59 +0200 Subject: [PATCH 2/5] Integrated the last icons --- Sankore_3.1.pro | 8 ++++---- resources/forms/mainWindow.ui | 7 +++++-- resources/images/paletteLibrary.png | Bin 1583 -> 1575 bytes resources/images/paletteNavigator.png | Bin 1422 -> 1203 bytes resources/images/toolbar/paraschool.png | Bin 395 -> 1574 bytes resources/images/toolbar/record.png | Bin 2446 -> 1708 bytes resources/sankore.qrc | 11 ++++++----- src/gui/UBDockPalette.cpp | 4 ++-- 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 853344b3..446840e1 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -137,10 +137,10 @@ macx { VERSION_RC_PATH = "$$BUILD_DIR/version_rc" # Embed version into executable for breakpad - QMAKE_LFLAGS += -sectcreate \ - __DATA \ - __version \ - $$VERSION_RC_PATH +# QMAKE_LFLAGS += -sectcreate \ +# __DATA \ +# __version \ +# $$VERSION_RC_PATH QMAKE_CXXFLAGS_RELEASE += -gdwarf-2 \ -mdynamic-no-pic diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index ae314289..ea75c526 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -1078,8 +1078,7 @@ - :/images/toolPalette/podcast.svg - :/images/toolPalette/podcastOn.svg:/images/toolPalette/podcast.svg + :/images/toolbar/record.png:/images/toolbar/record.png Podcast @@ -1637,6 +1636,10 @@ + + + :/images/toolbar/hide.png:/images/toolbar/hide.png + Hide Sankoré diff --git a/resources/images/paletteLibrary.png b/resources/images/paletteLibrary.png index 2a1d071b9f07fcf3bc2b9876ca30771d531f3193..f373ab8b69831c3d8b6702a5909eda461c862c1c 100644 GIT binary patch literal 1575 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 diff --git a/resources/images/paletteNavigator.png b/resources/images/paletteNavigator.png index cd4003efb7ece2907307a7d725856d88a85e0c70..b14bcae67eb50a1ff9b6fc56e76f0db72fd3ed7a 100644 GIT binary patch literal 1203 zcmbVMU1$_X9ABG8B~3~S3Pwb?8`DU0Bp3S-EV!^c z^Pl{+>cn* z(gsluX~xK*Ur-mrGz^&e0x4wnNjkQ8&DY^8mP64D)3vkWXnF||wjT|ecAUHa!+DN1 zjX3viX9i>(85Palqb}+l&F1ydk{&a-oo};U6^Rm9h-hrZ8nQj966Y3pCA#;I1&&=% zA*DFC=u{!o!^+r2Y$p!_ItT+c40#v~MIw>ytOy_wfG9vQ03%XRlmK9t9*$abjR7gA zq?c?_Db5uMaU?+~m&<%P$YXa6B@C(;Ul zvJwgf#X84I*mMLY6EG19r=kjkDUgumP&Ac}$>C%w7EOifSk?B3X6vYK*Q9oru)*hI zCD}z9!EPSop?U}O6fwbG5j(8h+sS4$-L!q#FVAAM3UbZ&k&$+>#V+JmGFPw-Va#X$-Wc zW;)h9*ji229x-~F?iubnbSOO@b49OTRv`AN_b_)%u_MZlX=& iAK-~Mo9!b)ym13_OrPzWZI|Ehe$3Jg6p->W`xV9mnJUpbKBw=g?w+J=a zB;Cd=>oQH6KNMs$`*wHC%k21Oc56!!2}qA^J&Kq9p?E0bNpkSu$sR-k*6Jk)9;*n& zLN8L*!|b04ZE1fn@Oi)A?|pxN1|AH2TMk2QN!Scxk;lKz0IRj_mh7zOK770q>6Y*os$3&13Zzba~W4j2dVb=5yL4~zl3RdZ@7VR6)t z=NA*U&IYo zs@n6mr_gsVeLviH4TcW?0Sr9Hc9JT;Z-O||#j&r9D|_8azF_Pm|7Pay60>?!-C zJ!@y}ckM#&#u5QO=TR6U%4h;EAou*gZZ65&0zf9O0%d$py7`y{D4^000SaNLh0L01FcU01FcV0GgZ_00007 zbV*G`2ipV$2_y%uk~mQS00H_*L_t(I%axMLOO-(whoAYr`Ht4{dLRp0RZxZ@1oa2B z5fu}{s7=y^Fev&10vA!6h*q_0(W;G#weSzHLN^rz83jf=)8p|%p6}v!n|WKPfu(VL zU|{BD-e=(b4eXIC*KTb)D}dhqOT%fJX%zCGUftMGoOnI<^8L1Ici+X~kDorv%JPy_ z7RypuT-;%mWo_-3+<*930B#K3Re!8;lBVmS&y%MUobK$v7z2QaZ0wa{^R}F9KduI^ z-~RC8`LnYC0|S@QO%3}VeEl{{PuDrV&(7j`9**NuDz(zn-9?%v#Bo9#$I5jbDHOaj zou}I6-J8jKv|rV{(ItRdYYf>@POr zYVX3$p*!=cw{Jks_xI9v;4mE>omguDp}xM3gKe#dY@e&+IEaW83R;bhzFO7B8cd$! zD2FUdHwBPo8P%%471ZA-tu>XUrHVGjk|YU&C642NUfd094N(+@x}~{=$+y!SJ#vC1 zsa;@QofN8nF7e*gdg07*qoM6N<$f~A(E-~a#s diff --git a/resources/images/toolbar/paraschool.png b/resources/images/toolbar/paraschool.png index 73d0e23c82b303a7c362e1f3bd517263318f919a..bdb6da434bcd7ad9464184dce40a1f9c0b613e93 100644 GIT binary patch literal 1574 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8) zeo$(0erZuMFyhjbK~@!5ITxiSmgEyn>bnwy$e0@Is<&})uUFDNPG765H_NiE7OOHFYr%Fk5*d)X=zw_8kbng`XJ zg4->oIQ8lS9itD5Sfq%C2?0|NhzU=&Kn^_Nr{)1udl4{MUvzRWW?*2N<>}%WQgLfd z$bSFeKndIL_x4?9(m&`Z_V`GXy+qcdMS+v8c3CnRY9_1u@>p%V%fq9mR;tbYB0k}c zjL)eDL5nhlwS!za8aaC1Hg5S|SNHuJd#&R_sl1}k@6Lao`+m-QJ4crn%Q+RDKHr?< z_363ZeLowYmr?1lkL+*V37#q=Vf6EIddVEd__I&{1m8XI|I~*-zo*R(D(8>$hO}(h z>{<~Y+W~+o;dz^dgsiSVGf7)v=pYBuRgGR z)v7krCuiHPtux=*Ew_p(>EClXQTz2bO8c85+PZu{Z1^r45&t<$=vCPgZnv<2K90+= zMpsVNCw|h3FY}9=b@rr9yKi6LN4~8lYr_7_%2YC(d`n->AVn!C%J-Jkzojt|KVGhv z&f53MFDaY(M?lclw8gAqdeWx@esxp?YKXRm*wxqaCGc6=O}=z__w9*4uXgEhX_Ree z71Nr%^7$L1z*#Z{{N4xkCZEvpiFvtt&n~HZmBo`CeWceOzGdOE*<@1XN0yg;?nmDJ z|G*|_@_o~GuI!l;*2}i(zvsWuYZx7WILu<-@#NHixOES`AL^Xz?XwbQnLc&Pzt21N zd=li*_;=#MuEZ@)&ZX0ADuNDgn0Kx)&GizmL`ZAT>)eG_B6SDErD}FuT=`AswX%gyZ~&Dy@1!Bh1@FUefkWFr*t$@|JQ-z~X(t9Pv5 zu>0_N2cE-MUZ1Pt&Zw{#lD1;I(DCN=)3ehicTH9J9XIo+he@~Sf=&D8@x6SuM&PD% p{nEPn_`hbI!g=a^KcX8L8FVs@s*h~HQwu7&Jzf1=);T3K0RTFMStkGh literal 395 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 M07*qoM6N<$g6$rf(*OVf diff --git a/resources/sankore.qrc b/resources/sankore.qrc index 6787e66e..9471e2cd 100644 --- a/resources/sankore.qrc +++ b/resources/sankore.qrc @@ -45,7 +45,6 @@ images/reload.svg images/frozen.svg images/unfrozen.svg - images/toolbar/display.png images/toolbar/window.png images/toolbar/plusBlack.png images/toolbar/plusBlackOn.png @@ -107,7 +106,6 @@ images/toolbar/captureWindow.png images/toolbar/extraTool.png images/toolbar/webUpload.png - images/toolbar/record.png images/toolbar/stop.png images/toolbar/pause.png images/toolbar/cut.png @@ -121,7 +119,6 @@ images/toolbar/eraserTool.png images/toolbar/lineTool.png images/toolbar/tools.png - images/toolbar/paraschool.png images/stylusPalette/arrow.png images/stylusPalette/arrowOn.png images/stylusPalette/eraser.png @@ -259,8 +256,6 @@ images/libpalette/notFound.png images/libpalette/trash_favorite.svg images/libpalette/back.png - images/paletteLibrary.png - images/paletteNavigator.png images/stylusPalette/eraserArrow.png images/stylusPalette/eraserOnArrow.png images/stylusPalette/markerArrow.png @@ -284,5 +279,11 @@ images/libpalette/miniFavorite.png images/libpalette/home.png images/toolbar/updates.png + images/paletteLibrary.png + images/paletteNavigator.png + images/toolbar/paraschool.png + images/toolbar/display.png + images/toolbar/hide.png + images/toolbar/record.png diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index e5116cb2..ca767671 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -277,7 +277,7 @@ void UBDockPalette::paintEvent(QPaintEvent *event) path.addRect(0.0, 0.0, width()-border(), height()); path.addRoundedRect(width()-2*border(), border(), 2*border(), TABSIZE, radius(), radius()); painter.drawPath(path); - painter.drawPixmap(width() - border(), border() + (TABSIZE / 2) - 6, 12, 12, mIcon); + painter.drawPixmap(width() - border() + 1, border() + 1 , border() - 4, TABSIZE - 2, mIcon); } else if(mOrientation == eUBDockOrientation_Right) { @@ -286,7 +286,7 @@ void UBDockPalette::paintEvent(QPaintEvent *event) path.addRect(border(), 0.0, width()-border(), height()); path.addRoundedRect(0.0, border(), 2*border(), TABSIZE, radius(), radius()); painter.drawPath(path); - painter.drawPixmap(2, border() + (TABSIZE / 2) - 6, 12, 12, mIcon); + painter.drawPixmap(2, border() + 1, border() - 3, TABSIZE - 2, mIcon); } else { From 77f564356539b05b94254f1e602fe1b72edf2dc4 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 May 2011 11:04:25 +0200 Subject: [PATCH 3/5] Updating this file --- resources/forms/mainWindow.ui | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index ae314289..e9c18a54 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -1563,6 +1563,9 @@ Share Capture on the Web + + true + From 2522cc2d770d0da09b224564a9f87177740a757b Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 May 2011 11:08:01 +0200 Subject: [PATCH 4/5] Adding this icon. --- resources/images/toolbar/hide.png | Bin 0 -> 1221 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/images/toolbar/hide.png diff --git a/resources/images/toolbar/hide.png b/resources/images/toolbar/hide.png new file mode 100644 index 0000000000000000000000000000000000000000..896347b1f12e3ba9a9f6ef11d9573f794f7d007e GIT binary patch literal 1221 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8) zeo$(0erZuMFyhjbK~@!5ITxiSmgEyn>bnwy$e0@Is<&})oSFDNPG765H_NiE7OOHFYr%Fk5*d)X=zi(4!W+?(R&(81?md^)(g0Woss4c;a=0! z{gE{+p1JF$((1&PR>gov*BZ}7gf0-6(4NC*B_DcbVa>;-=U+>IHQf8>|9+`u>>DJH zF^DF!Y%cq*@+!Ghkz>x@((m?8AM0h>jFfm-m6A(E-ISD`+B1qTn%Qd_#I#y2X~&cQ z^(u-g(-l`f=3Vit|8Q&1{J=FVlE*lV+XYqcba=P_|NnZyj=qV4-YS3CCvkkN7nuHt z!`UsQcY}lbS1o0i7xq5J%595hUT~f%cyuaH#zdx6Vt$cjJqxuLw~htw7}CKd?>9pgOF0?reYKn07ZtDnm{r-UW|7Gs^I literal 0 HcmV?d00001 From 2673646cc1777d935fa46123291dc000b55608c0 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 5 May 2011 15:16:39 +0200 Subject: [PATCH 5/5] Added the files update dialog --- src/gui/UBUpdateDlg.cpp | 76 +++++++++++++++++++++++++++++++++++++++++ src/gui/UBUpdateDlg.h | 41 ++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 src/gui/UBUpdateDlg.cpp create mode 100644 src/gui/UBUpdateDlg.h diff --git a/src/gui/UBUpdateDlg.cpp b/src/gui/UBUpdateDlg.cpp new file mode 100644 index 00000000..23922a85 --- /dev/null +++ b/src/gui/UBUpdateDlg.cpp @@ -0,0 +1,76 @@ +#include +#include + +#include "UBUpdateDlg.h" + +UBUpdateDlg::UBUpdateDlg(QWidget *parent, int nbFiles, const QString& bkpPath) + : QDialog(parent) + , mpDlgBttn(NULL) +{ + setFixedSize(400, 110); + setModal(true); + setWindowTitle(tr("Document updater")); + setLayout(&mLayout); + QString str = QString::number(nbFiles); + str.append(tr(" files require an update.")); + mNbFilesLabel.setText(str); + mLayout.addWidget(&mNbFilesLabel); + mBkpLabel.setText(tr("Backup path: ")); + mBkpPath.setText(bkpPath); + mBrowseBttn.setText(tr("Browse")); + mHLayout.addWidget(&mBkpLabel); + mHLayout.addWidget(&mBkpPath, 1); + mHLayout.addWidget(&mBrowseBttn); + mLayout.addLayout(&mHLayout); + + mpDlgBttn = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this); + mLayout.addWidget(mpDlgBttn); + + mpDlgBttn->button(QDialogButtonBox::Ok)->setText(tr("Update")); + mpDlgBttn->button(QDialogButtonBox::Cancel)->setText("Remind me later"); + + QObject::connect(&mBrowseBttn, SIGNAL(clicked()), this, SLOT(onBrowse())); + QObject::connect(mpDlgBttn, SIGNAL(accepted()), this, SLOT(onUpdate())); + QObject::connect(mpDlgBttn, SIGNAL(rejected()), this, SLOT(reject())); +} + +UBUpdateDlg::~UBUpdateDlg() +{ + if(NULL != mpDlgBttn) + { + delete mpDlgBttn; + mpDlgBttn = NULL; + } +} + +void UBUpdateDlg::onBrowse() +{ + QString qsSelectedDir; + qsSelectedDir = QFileDialog::getExistingDirectory(this, tr("Select a backup folder"), mBkpPath.text()); + mBkpPath.setText(qsSelectedDir); +} + +void UBUpdateDlg::onUpdate() +{ + emit updateFiles(); +} + +void UBUpdateDlg::onFilesUpdated(bool bResult) +{ + QString qsMsg; + + if(bResult) + { + qsMsg = tr("Files update successful"); + } + else + { + qsMsg = tr("An error occured during the update. The files have not been affected."); + } + QMessageBox::information(this, tr("Files update results"), qsMsg, QMessageBox::Ok); +} + +QString UBUpdateDlg::backupPath() +{ + return mBkpPath.text(); +} diff --git a/src/gui/UBUpdateDlg.h b/src/gui/UBUpdateDlg.h new file mode 100644 index 00000000..ea87d5ac --- /dev/null +++ b/src/gui/UBUpdateDlg.h @@ -0,0 +1,41 @@ +#ifndef UBUPDATEDLG_H +#define UBUPDATEDLG_H + +#include +#include +#include +#include +#include +#include +#include + +class UBUpdateDlg : public QDialog +{ + Q_OBJECT + +public: + UBUpdateDlg(QWidget *parent = 0, int nbFiles = 0, const QString& bkpPath = ""); + ~UBUpdateDlg(); + QString backupPath(); + +public slots: + void onFilesUpdated(bool bResult); + +signals: + void updateFiles(); + +private slots: + void onBrowse(); + void onUpdate(); + +private: + QLabel mNbFilesLabel; + QLabel mBkpLabel; + QLineEdit mBkpPath; + QPushButton mBrowseBttn; + QDialogButtonBox* mpDlgBttn; + QVBoxLayout mLayout; + QHBoxLayout mHLayout; +}; + +#endif // UBUPDATEDLG_H