Merge branch 'develop' into anatoly_dev

resources/library/search/Google images.wgs/locales/locales.js

-var locales = {
-	'en': {
-		'def_opts_val_size': 'Any',
-		'def_opts_val_type': 'Any',
-		'def_opts_val_image': 'Any',
-		'def_opts_val_copyright': 'Any',
-		'size_title': 'Size',
-		'size_small': 'Small',
-		'size_medium': 'Medium',
-		'size_large': 'Large',
-		'size_extra_large': 'Extra large',
-		'colorization_title': 'Colorization',
-		'coloriz_grayscale': 'Grayscale',
-		'coloriz_color': 'Color',
-		'main_color_title': 'Main color',
-		'm_color_black': 'Black',
-		'm_color_blue': 'Blue',
-		'm_color_brown': 'Brown',
-		'm_color_gray': 'Gray',
-		'm_color_green': 'Green',
-		'm_color_orange': 'Orange',
-		'm_color_pink': 'Pink',
-		'm_color_purple': 'Purple',
-		'm_color_red': 'Red',
-		'm_color_teal': 'Teal',
-		'm_color_white': 'White',
-		'm_color_yellow': 'Yellow',
-		'file_type_title': 'File type',
-		'image_type_title': 'Image type',
-		'image_type_faces': 'Faces',
-		'image_type_photo': 'Photo',
-		'image_type_clipart': 'Clipart',
-		'image_type_lineart': 'Lineart',
-		'image_license_title': 'Licence',
-		'image_license_reuse': 'Reuse',
-		'image_license_comm_reuse': 'Commercial reuse',
-		'image_license_modif': 'Modification',
-		'image_license_comm_modif': 'Commercial modification',
-		'disclaimer_title': 'This API is based on Google Image. Please refer to terms of use of this service.'
-	},
-	'fr': {
-		'def_opts_val_size': 'Toutes',
-		'def_opts_val_type': 'Tous',
-		'def_opts_val_image': 'Toutes',
-		'def_opts_val_copyright': 'Tous',
-		'size_title': 'Tailles',
-		'size_small': 'Petite',
-		'size_medium': 'Moyenne',
-		'size_large': 'Grande',
-		'size_extra_large': 'Extra large',
-		'colorization_title': 'Couleurs de l\'image',
-		'coloriz_grayscale': 'Noir et blanc',
-		'coloriz_color': 'En couleur',
-		'main_color_title': 'Couleur électronique',
-		'm_color_black': 'Noir',
-		'm_color_blue': 'Bleu',
-		'm_color_brown': 'Brun',
-		'm_color_gray': 'Gris',
-		'm_color_green': 'Vert',
-		'm_color_orange': 'Orange',
-		'm_color_pink': 'Rose',
-		'm_color_purple': 'Pourpre',
-		'm_color_red': 'Rouge',
-		'm_color_teal': 'Sarcelle',
-		'm_color_white': 'Blanc',
-		'm_color_yellow': 'Jaune',
-		'file_type_title': 'Types de fichier',
-		'image_type_title': 'Types d\'image',
-		'image_type_faces': 'Visages',
-		'image_type_photo': 'Photo',
-		'image_type_clipart': 'Images clipart',
-		'image_type_lineart': 'Dessins au trait',
-		'image_license_title': 'Droits d\'usage',
-		'image_license_reuse': 'Usage, distribution',
-		'image_license_comm_reuse': 'Usage, distribution, commercial',
-		'image_license_modif': 'Usage, distribution, modification',
-		'image_license_comm_modif': 'Usage, distribution, modification, commercial',
-		'disclaimer_title': 'Cette recherche utilise les services de Google Images. Veuillez vous référer aux conditions d\'utilisation de ce service.'
-	}
-};
+var locales = {
+	'en': {
+		'def_opts_val_size': 'Any',
+		'def_opts_val_type': 'Any',
+		'def_opts_val_image': 'Any',
+		'def_opts_val_copyright': 'Any',
+		'size_title': 'Size',
+		'size_small': 'Small',
+		'size_medium': 'Medium',
+		'size_large': 'Large',
+		'size_extra_large': 'Extra large',
+		'colorization_title': 'Colorization',
+		'coloriz_grayscale': 'Grayscale',
+		'coloriz_color': 'Color',
+		'main_color_title': 'Main color',
+		'm_color_black': 'Black',
+		'm_color_blue': 'Blue',
+		'm_color_brown': 'Brown',
+		'm_color_gray': 'Gray',
+		'm_color_green': 'Green',
+		'm_color_orange': 'Orange',
+		'm_color_pink': 'Pink',
+		'm_color_purple': 'Purple',
+		'm_color_red': 'Red',
+		'm_color_teal': 'Teal',
+		'm_color_white': 'White',
+		'm_color_yellow': 'Yellow',
+		'file_type_title': 'File type',
+		'image_type_title': 'Image type',
+		'image_type_faces': 'Faces',
+		'image_type_photo': 'Photo',
+		'image_type_clipart': 'Clipart',
+		'image_type_lineart': 'Lineart',
+		'image_license_title': 'Licence',
+		'image_license_reuse': 'Reuse',
+		'image_license_comm_reuse': 'Commercial reuse',
+		'image_license_modif': 'Modification',
+		'image_license_comm_modif': 'Commercial modification',
+		'disclaimer_title': 'This API is based on Google Image. Please refer to terms of use of this service.'
+	},
+	'fr': {
+		'def_opts_val_size': 'Toutes',
+		'def_opts_val_type': 'Tous',
+		'def_opts_val_image': 'Toutes',
+		'def_opts_val_copyright': 'Tous',
+		'size_title': 'Tailles',
+		'size_small': 'Petite',
+		'size_medium': 'Moyenne',
+		'size_large': 'Grande',
+		'size_extra_large': 'Extra large',
+		'colorization_title': 'Couleurs de l\'image',
+		'coloriz_grayscale': 'Noir et blanc',
+		'coloriz_color': 'En couleur',
+		'main_color_title': 'Couleur électronique',
+		'm_color_black': 'Noir',
+		'm_color_blue': 'Bleu',
+		'm_color_brown': 'Brun',
+		'm_color_gray': 'Gris',
+		'm_color_green': 'Vert',
+		'm_color_orange': 'Orange',
+		'm_color_pink': 'Rose',
+		'm_color_purple': 'Pourpre',
+		'm_color_red': 'Rouge',
+		'm_color_teal': 'Sarcelle',
+		'm_color_white': 'Blanc',
+		'm_color_yellow': 'Jaune',
+		'file_type_title': 'Types de fichier',
+		'image_type_title': 'Types d\'image',
+		'image_type_faces': 'Visages',
+		'image_type_photo': 'Photo',
+		'image_type_clipart': 'Images clipart',
+		'image_type_lineart': 'Dessins au trait',
+		'image_license_title': 'Droits d\'usage',
+		'image_license_reuse': 'Usage, distribution',
+		'image_license_comm_reuse': 'Usage, distribution, commercial',
+		'image_license_modif': 'Usage, distribution, modification',
+		'image_license_comm_modif': 'Usage, distribution, modification, commercial',
+		'disclaimer_title': 'Cette recherche utilise les services de Google Images. Veuillez vous référer aux conditions d\'utilisation de ce service.'
+	}
+};

resources/library/search/Google images.wgs/select/jquery.selectBox.css

-/* Dropdown control */
-.selectBox-dropdown {
-	min-width: 60px;
-	position: relative;
-	/*border: solid 1px #BBB;*/
-	line-height: 1.5;
-	text-decoration: none;
-	text-align: left;
-	color: #000;
-	outline: none;
-	vertical-align: middle;
-	background: #F2F2F2;
-	background: -moz-linear-gradient(top, #F8F8F8 1%, #E1E1E1 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(1%, #F8F8F8), color-stop(100%, #E1E1E1));
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F8F8F8', endColorstr='#E1E1E1', GradientType=0);
-	-moz-box-shadow: 0 1px 0 rgba(255, 255, 255, .75);
-	-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, .75);
-	box-shadow: 0 1px 0 rgba(255, 255, 255, .75);
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-	display: inline-block;
-	cursor: default;
-}
-
-.selectBox-dropdown:focus,
-.selectBox-dropdown:focus .selectBox-arrow {
-	border-color: #666;
-}
-
-.selectBox-dropdown.selectBox-menuShowing {
-	-moz-border-radius-bottomleft: 0;
-	-moz-border-radius-bottomright: 0;
-	-webkit-border-bottom-left-radius: 0;
-	-webkit-border-bottom-right-radius: 0;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-.selectBox-dropdown .selectBox-label {
-	padding: 2px 8px;
-	display: inline-block;
-	white-space: nowrap;
-	overflow: hidden;
-}
-
-.selectBox-dropdown .selectBox-arrow {
-	position: absolute;
-	top: 0;
-	right: 0;
-	width: 23px;
-	height: 100%;
-	background: url(jquery.selectBox-arrow.gif) 50% center no-repeat;
-	border-left: solid 1px #BBB;
-}
-
-
-/* Dropdown menu */
-.selectBox-dropdown-menu {
-	position: absolute;
-	z-index: 99999;
-	max-height: 200px;
-	min-height: 1em;
-	border: solid 1px #BBB; /* should be the same border width as .selectBox-dropdown */
-	background: #FFF;
-	-moz-box-shadow: 0 2px 6px rgba(0, 0, 0, .2);
-	-webkit-box-shadow: 0 2px 6px rgba(0, 0, 0, .2);
-	box-shadow: 0 2px 6px rgba(0, 0, 0, .2);
-	overflow: auto;
-}
-
-
-/* Inline control */
-.selectBox-inline {
-	min-width: 150px;
-	outline: none;
-	border: solid 1px #BBB;
-	background: #FFF;
-	display: inline-block;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-	overflow: auto;
-}
-
-.selectBox-inline:focus {
-	border-color: #666;
-}
-
-
-/* Options */
-.selectBox-options,
-.selectBox-options LI,
-.selectBox-options LI A {
-	list-style: none;
-	display: block;
-	cursor: default;
-	padding: 0;
-	margin: 0;
-}
-
-.selectBox-options LI A {
-	line-height: 1.5;
-	padding: 0 .5em;
-	white-space: nowrap;
-	overflow: hidden;
-	background: 6px center no-repeat;
-}
-
-.selectBox-options LI.selectBox-hover A {
-	background-color: #EEE;
-}
-
-.selectBox-options LI.selectBox-disabled A {
-	color: #888;
-	background-color: transparent;
-}
-
-.selectBox-options LI.selectBox-selected A {
-	background-color: #C8DEF4;
-}
-
-.selectBox-options .selectBox-optgroup {
-	color: #666;
-	background: #EEE;
-	font-weight: bold;
-	line-height: 1.5;
-	padding: 0 .3em;
-	white-space: nowrap;
-}
-
-
-/* Disabled state */
-.selectBox.selectBox-disabled {
-	color: #888 !important;
-}
-
-.selectBox-dropdown.selectBox-disabled .selectBox-arrow {
-	opacity: .5;
-	filter: alpha(opacity=50);
-	border-color: #666;
-}
-
-.selectBox-inline.selectBox-disabled {
-	color: #888 !important;
-}
-
-.selectBox-inline.selectBox-disabled .selectBox-options A {
-	background-color: transparent !important;
+/* Dropdown control */
+.selectBox-dropdown {
+	min-width: 60px;
+	position: relative;
+	/*border: solid 1px #BBB;*/
+	line-height: 1.5;
+	text-decoration: none;
+	text-align: left;
+	color: #000;
+	outline: none;
+	vertical-align: middle;
+	background: #F2F2F2;
+	background: -moz-linear-gradient(top, #F8F8F8 1%, #E1E1E1 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(1%, #F8F8F8), color-stop(100%, #E1E1E1));
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F8F8F8', endColorstr='#E1E1E1', GradientType=0);
+	-moz-box-shadow: 0 1px 0 rgba(255, 255, 255, .75);
+	-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, .75);
+	box-shadow: 0 1px 0 rgba(255, 255, 255, .75);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	display: inline-block;
+	cursor: default;
+}
+
+.selectBox-dropdown:focus,
+.selectBox-dropdown:focus .selectBox-arrow {
+	border-color: #666;
+}
+
+.selectBox-dropdown.selectBox-menuShowing {
+	-moz-border-radius-bottomleft: 0;
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-bottom-left-radius: 0;
+	-webkit-border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+.selectBox-dropdown .selectBox-label {
+	padding: 2px 8px;
+	display: inline-block;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.selectBox-dropdown .selectBox-arrow {
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 23px;
+	height: 100%;
+	background: url(jquery.selectBox-arrow.gif) 50% center no-repeat;
+	border-left: solid 1px #BBB;
+}
+
+
+/* Dropdown menu */
+.selectBox-dropdown-menu {
+	position: absolute;
+	z-index: 99999;
+	max-height: 200px;
+	min-height: 1em;
+	border: solid 1px #BBB; /* should be the same border width as .selectBox-dropdown */
+	background: #FFF;
+	-moz-box-shadow: 0 2px 6px rgba(0, 0, 0, .2);
+	-webkit-box-shadow: 0 2px 6px rgba(0, 0, 0, .2);
+	box-shadow: 0 2px 6px rgba(0, 0, 0, .2);
+	overflow: auto;
+}
+
+
+/* Inline control */
+.selectBox-inline {
+	min-width: 150px;
+	outline: none;
+	border: solid 1px #BBB;
+	background: #FFF;
+	display: inline-block;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	overflow: auto;
+}
+
+.selectBox-inline:focus {
+	border-color: #666;
+}
+
+
+/* Options */
+.selectBox-options,
+.selectBox-options LI,
+.selectBox-options LI A {
+	list-style: none;
+	display: block;
+	cursor: default;
+	padding: 0;
+	margin: 0;
+}
+
+.selectBox-options LI A {
+	line-height: 1.5;
+	padding: 0 .5em;
+	white-space: nowrap;
+	overflow: hidden;
+	background: 6px center no-repeat;
+}
+
+.selectBox-options LI.selectBox-hover A {
+	background-color: #EEE;
+}
+
+.selectBox-options LI.selectBox-disabled A {
+	color: #888;
+	background-color: transparent;
+}
+
+.selectBox-options LI.selectBox-selected A {
+	background-color: #C8DEF4;
+}
+
+.selectBox-options .selectBox-optgroup {
+	color: #666;
+	background: #EEE;
+	font-weight: bold;
+	line-height: 1.5;
+	padding: 0 .3em;
+	white-space: nowrap;
+}
+
+
+/* Disabled state */
+.selectBox.selectBox-disabled {
+	color: #888 !important;
+}
+
+.selectBox-dropdown.selectBox-disabled .selectBox-arrow {
+	opacity: .5;
+	filter: alpha(opacity=50);
+	border-color: #666;
+}
+
+.selectBox-inline.selectBox-disabled {
+	color: #888 !important;
+}
+
+.selectBox-inline.selectBox-disabled .selectBox-options A {
+	background-color: transparent !important;
 }
\ No newline at end of file

resources/library/search/Image Planete.wgs/css/basic.css

@@ -73,7 +73,7 @@ a {
     overflow: hidden;
     text-align: center;
     margin-top: 50px;
-    margin-bottom: 50px;
+    margin-bottom: 85px;
 }
 
 .search{

src/board/UBBoardController.h

@@ -40,6 +40,7 @@ class UBGraphicsAudioItem;
 class UBGraphicsWidgetItem;
 class UBBoardPaletteManager;
 class UBItem;
+class UBGraphicsItem;
 
 
 class UBBoardController : public UBDocumentContainer
@@ -158,7 +159,7 @@ class UBBoardController : public UBDocumentContainer
 
         void moveSceneToIndex(int source, int target);
         void duplicateScene(int index);
-        void duplicateItem(UBItem *item);
+        UBGraphicsItem *duplicateItem(UBItem *item);
         void deleteScene(int index);
 
         bool cacheIsVisible() {return mCacheWidgetIsEnabled;}

src/desktop/UBDesktopPalette.cpp

@@ -239,4 +239,4 @@ void UBDesktopPalette::parentResized()
     }
 
     moveInsideParent(p);
-}
\ No newline at end of file
+}

src/domain/UBGraphicsScene.h

@@ -109,8 +109,9 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
     };
 
     //        tmp stub for divide addings scene objects from undo mechanism implementation
-    bool isURStackIsEnabled(){ return mUndoRedoStackEnabled;}
-    void enableUndoRedoStack(){mUndoRedoStackEnabled = true;}
+        void enableUndoRedoStack(){mUndoRedoStackEnabled = true;}
+        void setURStackEnable(bool enable){mUndoRedoStackEnabled = enable;}
+        bool isURStackIsEnabled(){return mUndoRedoStackEnabled;}
 
         UBGraphicsScene(UBDocumentProxy *parent, bool enableUndoRedoStack = true);
         virtual ~UBGraphicsScene();

src/domain/UBItem.h

@@ -99,6 +99,8 @@ protected:
 
 public:
 
+    virtual int type() const = 0;
+
     inline UBGraphicsItemDelegate *Delegate() const { return mDelegate; }
 
     static void assignZValue(QGraphicsItem*, qreal value);