From e179d9ee0a16c1e12d4512b6bf28bf18f732c175 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Wed, 20 Apr 2011 17:30:40 +0200 Subject: [PATCH 1/4] Resolved an issue with the focus. --- .../interactive/Notes.wgt/js/ubw-main.js | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/resources/library/interactive/Notes.wgt/js/ubw-main.js b/resources/library/interactive/Notes.wgt/js/ubw-main.js index ad9e37e1..b5ff1e8d 100644 --- a/resources/library/interactive/Notes.wgt/js/ubw-main.js +++ b/resources/library/interactive/Notes.wgt/js/ubw-main.js @@ -19,41 +19,34 @@ function init(){ var maximize = $(''); var title = $(''); var textField = $('
'); - - var shadow = $("
 
") - .appendTo("body"); - - var shadowleft = $("") - .appendTo($("#sl")); - var shadowright = $("") - .appendTo($("#sr")); + var shadow = $("
 
") + .appendTo("body"); + var shadowleft = $("") + .appendTo($("#sl")); + var shadowright = $("") + .appendTo($("#sr")); $("#ubwidget") .append(header) .append(textField); - fontUp - .addClass('menuElement'); - fontDown - .addClass('menuElement'); - minimize - .addClass('menuElement'); - maximize - .addClass('menuElement') + fontUp.addClass('menuElement'); + fontDown.addClass('menuElement'); + minimize.addClass('menuElement'); + maximize.addClass('menuElement') .hide(); - header - .append(maximize) + header.append(maximize) .append(minimize) .append(fontUp) .append(fontDown); - var titletext = header.find('textarea'); + var titletext = header.find('textarea'); titletext.click( function(){ titletext.focus(); - + }); fontDown.click( @@ -71,6 +64,7 @@ function init(){ window.uniboard.setPreference("fontSize", newFontSize); }; + textField.focus(); }); fontUp.click( @@ -87,6 +81,8 @@ function init(){ if(window.uniboard){ window.uniboard.setPreference("fontSize", newFontSize); }; + + textField.focus(); }); minimize.click( From 162e257b96f0f2ebc167e8121f16459350c76539 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Thu, 21 Apr 2011 11:53:45 +0200 Subject: [PATCH 2/4] Added the persistence of the dockpalettes width. --- src/core/UBSettings.cpp | 3 +++ src/core/UBSettings.h | 8 ++++++++ src/gui/UBLibPalette.cpp | 9 ++++++++- src/gui/UBLibPalette.h | 2 ++ src/gui/UBNavigatorPalette.cpp | 5 +++-- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 956e12a6..3a907292 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -168,6 +168,9 @@ void UBSettings::init() appEnableAutomaticSoftwareUpdates = new UBSetting(this, "App", "EnableAutomaticSoftwareUpdates", true); appEnableSoftwareUpdates = new UBSetting(this, "App", "EnableSoftwareUpdates", true); appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", true); + navigPaletteWidth = new UBSetting(this, "Board", "NavigPaletteWidth", 300); + libPaletteWidth = new UBSetting(this, "Board", "LibPaletteWidth", 300); + appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false); appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", ""); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 20cc2ea5..6c9b7a14 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -310,6 +310,14 @@ class UBSettings : public QObject UBSetting* gipThumbnailWidth; UBSetting* soundThumbnailWidth; + UBSetting* navigPaletteWidth; + UBSetting* libPaletteWidth; + + /* + static int navigPaletteWidth; + static int libPaletteWidth; + */ + public slots: void setPenWidthIndex(int index); diff --git a/src/gui/UBLibPalette.cpp b/src/gui/UBLibPalette.cpp index 8494e064..d64827b6 100644 --- a/src/gui/UBLibPalette.cpp +++ b/src/gui/UBLibPalette.cpp @@ -17,9 +17,10 @@ UBLibPalette::UBLibPalette(QWidget *parent, const char *name):UBDockPalette(pare mIcon = QPixmap(":images/paletteLibrary.png"); setAcceptDrops(true); - resize(300, height()); + resize(UBSettings::settings()->libPaletteWidth->get().toInt(), height()); setContentsMargins(border(), 0, 0, 0); mCollapseWidth = 180; + mLastWidth = 300; mLayout = new QVBoxLayout(this); mLayout->setMargin(3); @@ -158,3 +159,9 @@ void UBLibPalette::showFolder() mActionBar->setButtons(mActionBar->previousButtonSet()); mStackedWidget->setCurrentIndex(ID_NAVIGATOR); } + +void UBLibPalette::resizeEvent(QResizeEvent *event) +{ + UBDockPalette::resizeEvent(event); + UBSettings::settings()->libPaletteWidth->set(width()); +} diff --git a/src/gui/UBLibPalette.h b/src/gui/UBLibPalette.h index 0bd66ab1..7dc6c6f8 100644 --- a/src/gui/UBLibPalette.h +++ b/src/gui/UBLibPalette.h @@ -9,6 +9,7 @@ #include #include #include +#include #include "UBDockPalette.h" #include "UBLibNavigatorWidget.h" @@ -33,6 +34,7 @@ protected: void dropEvent(QDropEvent *pEvent); void dragMoveEvent(QDragMoveEvent* pEvent); void mouseMoveEvent(QMouseEvent *event); + void resizeEvent(QResizeEvent *event); private slots: void showProperties(UBLibElement* elem); diff --git a/src/gui/UBNavigatorPalette.cpp b/src/gui/UBNavigatorPalette.cpp index 28232297..958f5676 100644 --- a/src/gui/UBNavigatorPalette.cpp +++ b/src/gui/UBNavigatorPalette.cpp @@ -17,8 +17,8 @@ UBNavigatorPalette::UBNavigatorPalette(QWidget *parent, const char *name):UBDock setOrientation(eUBDockOrientation_Left); setMaximumWidth(300); mIcon = QPixmap(":images/paletteNavigator.png"); - resize(maximumWidth(), height()); - + resize(UBSettings::settings()->navigPaletteWidth->get().toInt(), height()); + mLastWidth = 300; setContentsMargins(0, 0, border(), 0); // Build the gui @@ -135,6 +135,7 @@ void UBNavigatorPalette::resizeEvent(QResizeEvent *event) { mNavigator->setMinimumHeight(height() - 2*border()); } + UBSettings::settings()->navigPaletteWidth->set(width()); } void UBNavigatorPalette::timerEvent(QTimerEvent *event) From 704eb9264581324227a5c47d76b31837cc32ce38 Mon Sep 17 00:00:00 2001 From: shibakaneki Date: Tue, 26 Apr 2011 10:45:59 +0200 Subject: [PATCH 3/4] Deactivated the drag ability on non-dragable items --- src/board/UBLibraryController.cpp | 15 ++++++++++++- src/board/UBLibraryController.h | 3 +++ src/gui/UBLibraryWidget.cpp | 6 +++++ src/gui/UBThumbnailWidget.cpp | 37 ++++++++++++++++++------------- src/gui/UBThumbnailWidget.h | 1 + 5 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index e8d5e0eb..1eec04f6 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -221,40 +221,47 @@ QList UBLibraryController::rootCategoriesList() UBLibElement* element = new UBLibElement(eUBLibElementType_Folder, mAudioStandardDirectoryPath, tr("Audios", "Audio category element")); QImage* categoryImage = new QImage(":images/libpalette/AudiosCategory.svg"); element->setThumbnail(categoryImage); + element->setMoveable(false); categories << element; element = new UBLibElement(eUBLibElementType_Folder, mVideoStandardDirectoryPath, tr("Movies", "Movies category element")); categoryImage = new QImage(":images/libpalette/MoviesCategory.svg"); element->setThumbnail(categoryImage); + element->setMoveable(false); categories << element; element = new UBLibElement(eUBLibElementType_VirtualFolder, picturesVirtualPath, tr("Pictures", "Pictures category element")); categoryImage = new QImage(":images/libpalette/PicturesCategory.svg"); element->setThumbnail(categoryImage); + element->setMoveable(false); categories << element; QString path = UBSettings::settings()->uniboardShapeLibraryDirectory(); categoryImage = new QImage(":images/libpalette/ShapesCategory.svg"); element = new UBLibElement(eUBLibElementType_Folder, QUrl::fromLocalFile(path), tr("Shapes", "Shapes category element")); element->setThumbnail(categoryImage); + element->setMoveable(false); categories << element; categoryImage = new QImage(":images/libpalette/ApplicationsCategory.svg"); element = new UBLibElement(eUBLibElementType_VirtualFolder, applicationsVirtualPath, tr("Applications", "Applications category element")); element->setThumbnail(categoryImage); + element->setMoveable(false); categories << element; categoryImage = new QImage(":images/libpalette/FavoritesCategory.svg"); element = new UBLibElement(eUBLibElementType_VirtualFolder, favoriteVirtualPath, tr("Favorite", "Favorite category element")); element->setThumbnail(categoryImage); + element->setMoveable(false); categories << element; categoryImage = new QImage(":images/libpalette/InteractivesCategory.svg"); interactivesCategoryPath = UBSettings::settings()->uniboardGipLibraryDirectory(); element = new UBLibElement(eUBLibElementType_Folder, QUrl::fromLocalFile(interactivesCategoryPath), tr("Interactives", "Interactives category element")); element->setThumbnail(categoryImage); + element->setMoveable(false); categories << element; @@ -2429,7 +2436,8 @@ QString UBLibraryController::favoritePath() UBLibElement::UBLibElement() { mType = eUBLibElementType_Category; - mName = QObject::tr("/Home", "Category list label on nagigation tool bar"); + mName = QObject::tr("/Home", "Category list label on navigation tool bar"); + mbMoveable = false; } @@ -2439,6 +2447,7 @@ UBLibElement::UBLibElement(eUBLibElementType type, const QUrl &path, const QStri mPath = path; mName = name; mInfo = ""; + mbMoveable = true; if (type == eUBLibElementType_Folder) mThumbnail = QImage(":images/libpalette/folder.svg"); @@ -2448,6 +2457,9 @@ UBLibElement::UBLibElement(eUBLibElementType type, const QUrl &path, const QStri if (type == eUBLibElementType_Item) mExtension = QFileInfo(path.toLocalFile()).completeSuffix(); + + if(type == eUBLibElementType_VirtualFolder || type == eUBLibElementType_Category) + mbMoveable = false; } UBLibElement::~UBLibElement() @@ -2483,6 +2495,7 @@ UBLibElement* UBLibElement::trashElement() trashElement = new UBLibElement(eUBLibElementType_Folder, UBSettings::trashLibraryPaletteDirPath(), QObject::tr("Trash", "Pictures category element")); QImage *categoryImage = new QImage(":images/libpalette/TrashCategory.svg"); trashElement->setThumbnail(categoryImage); + trashElement->setMoveable(false); return trashElement; } diff --git a/src/board/UBLibraryController.h b/src/board/UBLibraryController.h index fcff4495..2061d689 100644 --- a/src/board/UBLibraryController.h +++ b/src/board/UBLibraryController.h @@ -46,6 +46,8 @@ public: void setName(QString name){mName = name;} QString extension(){return mExtension;} void setExtension(QString &extension){ mExtension = extension;} + bool isMoveable(){return mbMoveable;} + void setMoveable(bool bState){mbMoveable = bState;} private: eUBLibElementType mType; @@ -54,6 +56,7 @@ private: QString mInfo; QString mName; QString mExtension; + bool mbMoveable; }; class UBChainedLibElement diff --git a/src/gui/UBLibraryWidget.cpp b/src/gui/UBLibraryWidget.cpp index 3b6c5d62..f28239e2 100644 --- a/src/gui/UBLibraryWidget.cpp +++ b/src/gui/UBLibraryWidget.cpp @@ -209,6 +209,7 @@ void UBLibraryWidget::onSelectionChanged() QList qlSelectedItems; QList qlGI = selectedItems(); + bCanDrag = true; foreach(QGraphicsItem* it, qlGI) { int itIndex = mGraphicItems.indexOf(it); @@ -222,6 +223,11 @@ void UBLibraryWidget::onSelectionChanged() { qlSelectedItems << pElem; } + + if(!pElem->isMoveable()) + { + bCanDrag = false; + } } } } diff --git a/src/gui/UBThumbnailWidget.cpp b/src/gui/UBThumbnailWidget.cpp index 4d994f7b..765e99a0 100644 --- a/src/gui/UBThumbnailWidget.cpp +++ b/src/gui/UBThumbnailWidget.cpp @@ -19,6 +19,8 @@ UBThumbnailWidget::UBThumbnailWidget(QWidget* parent) , mSelectionSpan(0) , mLassoRectItem(0) { + // By default, the drag is possible + bCanDrag = true; setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing); setFrameShape(QFrame::NoFrame); @@ -326,30 +328,33 @@ void UBThumbnailWidget::mouseMoveEvent(QMouseEvent *event) if (0 == selectedItems().size()) return; - QDrag *drag = new QDrag(this); - QMimeData *mime = new QMimeData(); + if(bCanDrag) + { + QDrag *drag = new QDrag(this); + QMimeData *mime = new QMimeData(); - if (mMimeType.length() > 0) - mime->setData(mMimeType, QByteArray()); // trick the d&d system to register our own mime type + if (mMimeType.length() > 0) + mime->setData(mMimeType, QByteArray()); // trick the d&d system to register our own mime type - drag->setMimeData(mime); + drag->setMimeData(mime); - QList qlElements; + QList qlElements; - foreach (QGraphicsItem* item, selectedItems()) - { - if (mGraphicItems.contains(item)) + foreach (QGraphicsItem* item, selectedItems()) { - if (mGraphicItems.indexOf(item) <= mItemsPaths.size()){ - qlElements << mItemsPaths.at(mGraphicItems.indexOf(item)); + if (mGraphicItems.contains(item)) + { + if (mGraphicItems.indexOf(item) <= mItemsPaths.size()){ + qlElements << mItemsPaths.at(mGraphicItems.indexOf(item)); + } } } - } - if (qlElements.size() > 0){ - mime->setUrls(qlElements); - drag->setMimeData(mime); - drag->exec(); + if (qlElements.size() > 0){ + mime->setUrls(qlElements); + drag->setMimeData(mime); + drag->exec(); + } } } diff --git a/src/gui/UBThumbnailWidget.h b/src/gui/UBThumbnailWidget.h index 47cf47a3..a5660fc2 100644 --- a/src/gui/UBThumbnailWidget.h +++ b/src/gui/UBThumbnailWidget.h @@ -77,6 +77,7 @@ class UBThumbnailWidget : public QGraphicsView QList mItemsPaths; QStringList mLabels; bool bSelectionInProgress; + bool bCanDrag; private: void selectAll(); From 51b2330beff5e93f2dbd7957fefa32f8968363af Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Tue, 26 Apr 2011 16:48:11 +0200 Subject: [PATCH 4/4] Ignoring file config --- .gitignore | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..d6b5fde6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +# Compiled source # +################### +*.com +*.class +#*.dll +#*.exe +#*.o +#*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +# OS generated files # +###################### +.DS_Store? +ehthumbs.db +Icon? +Thumbs.db + +# IDE # +####### +*.kdev4 +*.cproject +*.xcodeproj +*.pdb +*.sln +*.suo +*.vcproj +*.ncb