MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
preferencesAboutTextFull
Ilia Ryabokon 12 years ago
parent 2fdc027a8d 67fbd3a135
commit bcdd655b78
8 changed files with 159 additions and 78 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 20
      resources/library/interactivities/Contraste.wgt/css/basic.css
  2. BIN
      resources/library/interactivities/Contraste.wgt/images/trgDown.png
  3. BIN
      resources/library/interactivities/Contraste.wgt/images/trgRight.png
  4. 52
      resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
  5. 56
      resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
  6. 57
      resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
  7. 1
      src/gui/UBFeaturesActionBar.h
  8. 1
      src/gui/UBFeaturesWidget.cpp

20
resources/library/interactivities/Contraste.wgt/css/basic.css
Unescape View File

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

BIN
resources/library/interactivities/Contraste.wgt/images/trgDown.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 475 B

BIN
resources/library/interactivities/Contraste.wgt/images/trgRight.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 447 B

52
resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
Unescape View File

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

56
resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
Unescape View File

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

57
resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
Unescape View File

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

1
src/gui/UBFeaturesActionBar.h
Unescape View File

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

1
src/gui/UBFeaturesWidget.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save