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

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

resources/forms/mainWindow.ui

@@ -1078,8 +1078,7 @@
    </property>
    <property name="icon">
     <iconset resource="../sankore.qrc">
-     <normaloff>:/images/toolPalette/podcast.svg</normaloff>
-     <normalon>:/images/toolPalette/podcastOn.svg</normalon>:/images/toolPalette/podcast.svg</iconset>
+     <normaloff>:/images/toolbar/record.png</normaloff>:/images/toolbar/record.png</iconset>
    </property>
    <property name="text">
     <string>Podcast</string>
@@ -1563,6 +1562,9 @@
    <property name="toolTip">
     <string>Share Capture on the Web</string>
    </property>
+   <property name="visible">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionDesktopTools">
    <property name="checkable">
@@ -1637,6 +1639,10 @@
    </property>
   </action>
   <action name="actionHideApplication">
+   <property name="icon">
+    <iconset resource="../sankore.qrc">
+     <normaloff>:/images/toolbar/hide.png</normaloff>:/images/toolbar/hide.png</iconset>
+   </property>
    <property name="text">
     <string>Hide Sankoré</string>
    </property>

resources/sankore.qrc

@@ -45,7 +45,6 @@
         <file>images/reload.svg</file>
         <file>images/frozen.svg</file>
         <file>images/unfrozen.svg</file>
-        <file>images/toolbar/display.png</file>
         <file>images/toolbar/window.png</file>
         <file>images/toolbar/plusBlack.png</file>
         <file>images/toolbar/plusBlackOn.png</file>
@@ -107,7 +106,6 @@
         <file>images/toolbar/captureWindow.png</file>
         <file>images/toolbar/extraTool.png</file>
         <file>images/toolbar/webUpload.png</file>
-        <file>images/toolbar/record.png</file>
         <file>images/toolbar/stop.png</file>
         <file>images/toolbar/pause.png</file>
         <file>images/toolbar/cut.png</file>
@@ -121,7 +119,6 @@
         <file>images/toolbar/eraserTool.png</file>
         <file>images/toolbar/lineTool.png</file>
         <file>images/toolbar/tools.png</file>
-        <file>images/toolbar/paraschool.png</file>
         <file>images/stylusPalette/arrow.png</file>
         <file>images/stylusPalette/arrowOn.png</file>
         <file>images/stylusPalette/eraser.png</file>
@@ -259,8 +256,6 @@
         <file>images/libpalette/notFound.png</file>
         <file>images/libpalette/trash_favorite.svg</file>
         <file>images/libpalette/back.png</file>
-        <file>images/paletteLibrary.png</file>
-        <file>images/paletteNavigator.png</file>
         <file>images/stylusPalette/eraserArrow.png</file>
         <file>images/stylusPalette/eraserOnArrow.png</file>
         <file>images/stylusPalette/markerArrow.png</file>
@@ -284,5 +279,11 @@
         <file>images/libpalette/miniFavorite.png</file>
         <file>images/libpalette/home.png</file>
         <file>images/toolbar/updates.png</file>
+        <file>images/paletteLibrary.png</file>
+        <file>images/paletteNavigator.png</file>
+        <file>images/toolbar/paraschool.png</file>
+        <file>images/toolbar/display.png</file>
+        <file>images/toolbar/hide.png</file>
+        <file>images/toolbar/record.png</file>
     </qresource>
 </RCC>

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()));

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
     {

src/gui/UBUpdateDlg.cpp

+#include <QMessageBox>
+#include <QFileDialog>
+
+#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();
+}

src/gui/UBUpdateDlg.h

+#ifndef UBUPDATEDLG_H
+#define UBUPDATEDLG_H
+
+#include <QDialog>
+#include <QLabel>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+
+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