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

resources/library/interactivities/Contraste.wgt/css/basic.css

@@ -60,6 +60,7 @@ body{
 
 .shadowDiv{
     width: 100%;
+    height: 100%;
     display: none;
     opacity: 0.7;
     background-color: black;
@@ -67,7 +68,10 @@ body{
     -webkit-border-radius: 3px;
     border-radius: 3px;
     border-radius: 3px;
-    z-index: 100;
+    z-index: 400;
+    position: absolute;
+    top: 0;
+    left: 0;
 }
 
 .popupBack{
@@ -126,8 +130,6 @@ body{
 }
 
 .readyTask{
-    margin: 2px;
-    padding: 2px;
     width: 100%;
     height: 100%;
     overflow: hidden;
@@ -167,9 +169,11 @@ body{
     height: 65%;
     cursor: e-resize;
     position: absolute;
-    background: none;
+    background-image: url(../images/trgRight.png);
+    background-position: center;
+    background-repeat: no-repeat;
     right: -10px;
-    top: 20%;
+    top: 18%;
 }
 
 .bottomResize{
@@ -177,9 +181,11 @@ body{
     height: 10px;
     cursor: n-resize;
     position: absolute;
-    background: none;
+    background-image: url(../images/trgDown.png);
+    background-position: center;
+    background-repeat: no-repeat;
     bottom: -10px;
-    left: 20%;
+    left: 18%;
 }
 
 /*new design*/

resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js

@@ -82,9 +82,9 @@ function init(){
                 .css("left",importArray[i].left);                                
                 tmpReadyTask.appendTo("#data");
             }  
-        }
             $(document).disableTextSelect();
         }        
+    }
     
     /* ------------- BUTTONS -------------*/
     
@@ -182,10 +182,16 @@ function init(){
     });
     
     $("#wgt_add").click(function(){
-        shadowDiv.show("fast", function(){
+        if($("#wgt_help").hasClass("open")){
+            $("#help").slideUp("100", function(){
+                $("#wgt_help").removeClass("open");
+                $("#data").show();
+            });
+        }
+        shadowDiv.show()
         shadowOver = true;
         popupBack.show("slow");            
-        });
+
         $(document).disableTextSelect();
     });
     
@@ -203,7 +209,7 @@ function init(){
     var rightDiv = $("<div id='rightDiv' class='rightDiv'>").appendTo("#data");
     
     //divs for adding a new item
-    var shadowDiv = $("<div id='shadowDiv' class='shadowDiv'>").appendTo("#data");
+    var shadowDiv = $("<div id='shadowDiv' class='shadowDiv'>").appendTo("html");
     var popupBack = $("<div id='popupBack' class='popupBack'>").appendTo("#data");
     
     //input fields and buttons for a popup window
@@ -228,37 +234,39 @@ function init(){
     });
     
     cancelButton.click(function(){
-        $(document).enableTextSelect();
         popupBack.hide("slow", function(){
             $("#resultText, #expresionText").val("")
             .css("background-color", "#ffc");
-            shadowDiv.hide("fast");
+            shadowDiv.hide();
             shadowOver = false; 
+            $(document).enableTextSelect();
         });        
+        
     });
     
     okButton.click(function(){
-        $(document).enableTextSelect();
         if(checkEmptyFields(expresionText) && checkEmptyFields(resultText)){
             popupBack.hide("slow", function(){
-                shadowDiv.hide("fast");
+                shadowDiv.hide();
                 shadowOver = false;
                 addTask(expresionText.val(), resultText.val());
                 exportToSankore();
                 $("#resultText, #expresionText").val("")
                 .css("background-color", "#ffc");
+                $(document).enableTextSelect();
             })
         }
+        
     });
     
     /* -------------- THE END OF WORK WITH POPUP BUTTONS AND FIELDS ---------------*/    
     
     // a work with dragging possibility    
-    $("input:text, .style_select").mouseover(function(){
+    $("input:text").mouseover(function(){
         $(document).enableTextSelect(); 
     });
                         
-    $("input:text, .style_select").mouseout(function(){
+    $("input:text").mouseout(function(){
         $(document).disableTextSelect(); 
     });
                     
@@ -270,6 +278,8 @@ function init(){
             resizeObj.width = $(this).width();
             resizeObj.height = $(this).height();
         }
+        if($("#wgt_display").hasClass("selected"))
+            $(document).disableTextSelect();
     });
     
     $(".rightResize").live("mousedown",function(event){
@@ -297,12 +307,24 @@ function init(){
     
     $("body").mousemove(function(event){
         if(dragElement && !shadowOver){ 
-            if(resizeObj.x)
+            var top = event.pageY - coords.top;
+            var left = event.pageX - coords.left;
+            var bottom = top + dragElement.height();
+            var right = left + dragElement.width();            
+            if(resizeObj.x){
+                if(right < ($(window).width() - 54))
                     dragElement.width(event.pageX - dragElement.position().left);
-            else if(resizeObj.y)                
+            }
+            else if(resizeObj.y){   
+                if(bottom < ($(window).height() - 54))
                     dragElement.height(event.pageY - dragElement.position().top);
-            else
-                dragElement.css("top",event.pageY - coords.top).css("left", event.pageX - coords.left);
+            }
+            else {
+                if((top > 54) && (bottom < ($(window).height() - 54)))
+                    dragElement.css("top",event.pageY - coords.top);
+                if((left >= 54) && (right < ($(window).width() - 54))) 
+                    dragElement.css("left", event.pageX - coords.left);
+            }
         }
     });
     
@@ -463,4 +485,6 @@ function changeStyle(val){
             $("body, html").addClass("without_radius");
             break;
     }
+    if($("#wgt_edit").hasClass("selected"))
+        $(document).enableTextSelect(); 
 }

resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js

@@ -23,9 +23,9 @@ var sankoreLang = {
     cancel: "Отмена",
     wgt_name: "Черный/желтый",
     reload: "Обновить",
-    slate: "Узор",
-    pad: "Планшет",
-    none: "Нет",
+    slate: "узор",
+    pad: "планшет",
+    none: "нет",
     help: "Помощь",
     help_content: "Пример текста помощи ..."
 };
@@ -182,10 +182,16 @@ function init(){
     });
     
     $("#wgt_add").click(function(){
-        shadowDiv.show("fast", function(){
+        if($("#wgt_help").hasClass("open")){
+            $("#help").slideUp("100", function(){
+                $("#wgt_help").removeClass("open");
+                $("#data").show();
+            });
+        }
+        shadowDiv.show()
         shadowOver = true;
         popupBack.show("slow");            
-        });
+
         $(document).disableTextSelect();
     });
     
@@ -203,7 +209,7 @@ function init(){
     var rightDiv = $("<div id='rightDiv' class='rightDiv'>").appendTo("#data");
     
     //divs for adding a new item
-    var shadowDiv = $("<div id='shadowDiv' class='shadowDiv'>").appendTo("#data");
+    var shadowDiv = $("<div id='shadowDiv' class='shadowDiv'>").appendTo("html");
     var popupBack = $("<div id='popupBack' class='popupBack'>").appendTo("#data");
     
     //input fields and buttons for a popup window
@@ -228,37 +234,39 @@ function init(){
     });
     
     cancelButton.click(function(){
-        $(document).enableTextSelect();
         popupBack.hide("slow", function(){
             $("#resultText, #expresionText").val("")
             .css("background-color", "#ffc");
-            shadowDiv.hide("fast");
+            shadowDiv.hide();
             shadowOver = false; 
+            $(document).enableTextSelect();
         });        
+        
     });
     
     okButton.click(function(){
-        $(document).enableTextSelect();
         if(checkEmptyFields(expresionText) && checkEmptyFields(resultText)){
             popupBack.hide("slow", function(){
-                shadowDiv.hide("fast");
+                shadowDiv.hide();
                 shadowOver = false;
                 addTask(expresionText.val(), resultText.val());
                 exportToSankore();
                 $("#resultText, #expresionText").val("")
                 .css("background-color", "#ffc");
+                $(document).enableTextSelect();
             })
         }
+        
     });
     
     /* -------------- THE END OF WORK WITH POPUP BUTTONS AND FIELDS ---------------*/    
     
     // a work with dragging possibility    
-    $("input:text, .style_select").mouseover(function(){
+    $("input:text").mouseover(function(){
         $(document).enableTextSelect(); 
     });
                         
-    $("input:text, .style_select").mouseout(function(){
+    $("input:text").mouseout(function(){
         $(document).disableTextSelect(); 
     });
                     
@@ -270,6 +278,8 @@ function init(){
             resizeObj.width = $(this).width();
             resizeObj.height = $(this).height();
         }
+        if($("#wgt_display").hasClass("selected"))
+            $(document).disableTextSelect();
     });
     
     $(".rightResize").live("mousedown",function(event){
@@ -297,12 +307,24 @@ function init(){
     
     $("body").mousemove(function(event){
         if(dragElement && !shadowOver){ 
-            if(resizeObj.x)
+            var top = event.pageY - coords.top;
+            var left = event.pageX - coords.left;
+            var bottom = top + dragElement.height();
+            var right = left + dragElement.width();            
+            if(resizeObj.x){
+                if(right < ($(window).width() - 54))
                     dragElement.width(event.pageX - dragElement.position().left);
-            else if(resizeObj.y)                
+            }
+            else if(resizeObj.y){   
+                if(bottom < ($(window).height() - 54))
                     dragElement.height(event.pageY - dragElement.position().top);
-            else
-                dragElement.css("top",event.pageY - coords.top).css("left", event.pageX - coords.left);
+            }
+            else {
+                if((top > 54) && (bottom < ($(window).height() - 54)))
+                    dragElement.css("top",event.pageY - coords.top);
+                if((left >= 54) && (right < ($(window).width() - 54))) 
+                    dragElement.css("left", event.pageX - coords.left);
+            }
         }
     });
     
@@ -463,4 +485,6 @@ function changeStyle(val){
             $("body, html").addClass("without_radius");
             break;
     }
+    if($("#wgt_edit").hasClass("selected"))
+        $(document).enableTextSelect(); 
 }

resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js

@@ -23,9 +23,9 @@ var sankoreLang = {
     cancel: "Cancel",
     wgt_name: "Contrast",
     reload: "Reload",
-    slate: "Wood",
-    pad: "Pad",
-    none: "None",
+    slate: "wood",
+    pad: "pad",
+    none: "none",
     help: "Help",
     help_content: "This is an example of help content ..."
 };
@@ -88,11 +88,14 @@ function init(){
     
     /* ------------- BUTTONS -------------*/
     
+    if(window.sankore){
         if(sankore.preference("by_style","")){
             changeStyle(sankore.preference("by_style",""));
             $(".style_select").val(sankore.preference("by_style",""));
         } else
             changeStyle("3")
+    } else
+        changeStyle("3")
 
     $("#wgt_display, #wgt_edit").click(function(event){
         if(this.id == "wgt_display"){
@@ -182,10 +185,15 @@ function init(){
     });
     
     $("#wgt_add").click(function(){
-        shadowDiv.show("fast", function(){
+        if($("#wgt_help").hasClass("open")){
+            $("#help").slideUp("100", function(){
+                $("#wgt_help").removeClass("open");
+                $("#data").show();
+            });
+        }
+        shadowDiv.show();
         shadowOver = true;
         popupBack.show("slow");        
-        });
         $(document).disableTextSelect();
     });
     
@@ -203,7 +211,7 @@ function init(){
     var rightDiv = $("<div id='rightDiv' class='rightDiv'>").appendTo("#data");
     
     //divs for adding a new item
-    var shadowDiv = $("<div id='shadowDiv' class='shadowDiv'>").appendTo("#data");
+    var shadowDiv = $("<div id='shadowDiv' class='shadowDiv'>").appendTo("html");
     var popupBack = $("<div id='popupBack' class='popupBack'>").appendTo("#data");
     
     //input fields and buttons for a popup window
@@ -228,25 +236,25 @@ function init(){
     });
     
     cancelButton.click(function(){
-        $(document).enableTextSelect();
         popupBack.hide("slow", function(){
             $("#resultText, #expresionText").val("")
             .css("background-color", "#ffc");
-            shadowDiv.hide("fast");
+            shadowDiv.hide();
             shadowOver = false; 
+            $(document).enableTextSelect();
         });        
     });
     
     okButton.click(function(){
-        $(document).enableTextSelect();
         if(checkEmptyFields(expresionText) && checkEmptyFields(resultText)){
             popupBack.hide("slow", function(){
-                shadowDiv.hide("fast");
+                shadowDiv.hide();
                 shadowOver = false;
                 addTask(expresionText.val(), resultText.val());
                 exportToSankore();
                 $("#resultText, #expresionText").val("")
                 .css("background-color", "#ffc");
+                $(document).enableTextSelect();
             })
         }
     });
@@ -254,11 +262,11 @@ function init(){
     /* -------------- THE END OF WORK WITH POPUP BUTTONS AND FIELDS ---------------*/    
     
     // a work with dragging possibility    
-    $("input:text, .style_select").mouseover(function(){
+    $("input:text").mouseover(function(){
         $(document).enableTextSelect(); 
     });
                         
-    $("input:text, .style_select").mouseout(function(){
+    $("input:text").mouseout(function(){
         $(document).disableTextSelect(); 
     });
                     
@@ -270,6 +278,8 @@ function init(){
             resizeObj.width = $(this).width();
             resizeObj.height = $(this).height();
         }
+        if($("#wgt_display").hasClass("selected"))
+            $(document).disableTextSelect();
     });
     
     $(".rightResize").live("mousedown",function(event){
@@ -297,12 +307,24 @@ function init(){
     
     $("body").mousemove(function(event){
         if(dragElement && !shadowOver){ 
-            if(resizeObj.x)
+            var top = event.pageY - coords.top;
+            var left = event.pageX - coords.left;
+            var bottom = top + dragElement.height();
+            var right = left + dragElement.width();            
+            if(resizeObj.x){
+                if(right < ($(window).width() - 54))
                     dragElement.width(event.pageX - dragElement.position().left);
-            else if(resizeObj.y)                
+            }
+            else if(resizeObj.y){   
+                if(bottom < ($(window).height() - 54))
                     dragElement.height(event.pageY - dragElement.position().top);
-            else
-                dragElement.css("top",event.pageY - coords.top).css("left", event.pageX - coords.left);
+            }
+            else {
+                if((top > 54) && (bottom < ($(window).height() - 54)))
+                    dragElement.css("top",event.pageY - coords.top);
+                if((left >= 54) && (right < ($(window).width() - 54))) 
+                    dragElement.css("left", event.pageX - coords.left);
+            }
         }
     });
     
@@ -375,6 +397,7 @@ function init(){
                 });
             }              
         }
+        if(window.sankore)
             sankore.setPreference("blackYellowData", JSON.stringify(arrayToExport));
     }
 }
@@ -463,4 +486,6 @@ function changeStyle(val){
             $("body, html").addClass("without_radius");
             break;
     }
+    if($("#wgt_edit").hasClass("selected"))
+        $(document).enableTextSelect(); 
 }

src/gui/UBFeaturesActionBar.h

@@ -42,6 +42,7 @@ public:
     ~UBFeaturesActionBar();
 	
 	void setCurrentState( UBFeaturesActionBarState state );
+    void cleanText(){ mSearchBar->clear(); }
 
 signals:
 	void searchElement(const QString &text);

src/gui/UBFeaturesWidget.cpp

@@ -142,6 +142,7 @@ void UBFeaturesWidget::currentSelected(const QModelIndex &current)
         centralWidget->showElement(feature, UBFeaturesCentralWidget::FeaturePropertiesList);
         mActionBar->setCurrentState( IN_PROPERTIES );
     }
+    mActionBar->cleanText();
 }
 
 void UBFeaturesWidget::createNewFolder()