Merge branch 'claudio-dev' of github.com:Sankore/Sankore-3.1 into claudio-dev

preferencesAboutTextFull
Claudio Valerio 12 years ago
commit 76a43c9fd9
  1. 10
      resources/library/applications/Nuancier.wgt/js/colorpicker.js
  2. 1
      src/board/UBFeaturesController.cpp
  3. 6
      src/board/UBFeaturesController.h

@ -70,12 +70,12 @@
$("div.tools_change").removeClass("tools_compass"); $("div.tools_change").removeClass("tools_compass");
window.sankore.setTool('pen'); window.sankore.setTool('pen');
window.sankore.setPenColor('#' + HSBToHex(hsb)); window.sankore.setPenColor('#' + HSBToHex(hsb));
sankore.returnStatus("PEN installed", penFlag); //sankore.returnStatus("PEN installed", penFlag);
} else { } else {
$("div.tools_change").addClass("tools_compass"); $("div.tools_change").addClass("tools_compass");
window.sankore.setTool('compass'); window.sankore.setTool('compass');
window.sankore.setPenColor('#' + HSBToHex(hsb)); window.sankore.setPenColor('#' + HSBToHex(hsb));
sankore.returnStatus("Compass installed", penFlag); //sankore.returnStatus("Compass installed", penFlag);
} }
}, },
keyDown = function (ev) { keyDown = function (ev) {
@ -224,12 +224,12 @@
$("div.tools_change").removeClass("tools_compass"); $("div.tools_change").removeClass("tools_compass");
window.sankore.setTool('pen'); window.sankore.setTool('pen');
window.sankore.setPenColor('#' + HSBToHex(tmpColor.b)); window.sankore.setPenColor('#' + HSBToHex(tmpColor.b));
sankore.returnStatus("PEN installed", penFlag); //sankore.returnStatus("PEN installed", penFlag);
} else { } else {
$("div.tools_change").addClass("tools_compass"); $("div.tools_change").addClass("tools_compass");
window.sankore.setTool('compass'); window.sankore.setTool('compass');
window.sankore.setPenColor('#' + HSBToHex(tmpColor.b)); window.sankore.setPenColor('#' + HSBToHex(tmpColor.b));
sankore.returnStatus("Compass installed", penFlag); //sankore.returnStatus("Compass installed", penFlag);
} }
//$(tmpColor.a).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(tmpColor.b)); //$(tmpColor.a).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(tmpColor.b));
return false; return false;
@ -261,7 +261,7 @@
cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el); cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
penFlag = (penFlag)?false:true; penFlag = (penFlag)?false:true;
setNewColor(col, cal.get(0)); setNewColor(col, cal.get(0));
sankore.returnStatus("startEditing()", penFlag); //sankore.returnStatus("startEditing()", penFlag);
}, },
show = function (ev) { show = function (ev) {
var cal = $('#' + $(this).data('colorpickerId')); var cal = $('#' + $(this).data('colorpickerId'));

@ -260,6 +260,7 @@ bool UBFeature::isDeletable() const
|| elementType == FEATURE_AUDIO || elementType == FEATURE_AUDIO
|| elementType == FEATURE_VIDEO || elementType == FEATURE_VIDEO
|| elementType == FEATURE_IMAGE || elementType == FEATURE_IMAGE
|| elementType == FEATURE_FLASH
|| elementType == FEATURE_FOLDER; || elementType == FEATURE_FOLDER;
} }

@ -73,14 +73,14 @@ enum UBFeatureElementType
FEATURE_VIRTUALFOLDER, FEATURE_VIRTUALFOLDER,
FEATURE_FOLDER, FEATURE_FOLDER,
FEATURE_INTERACTIVE, FEATURE_INTERACTIVE,
FEATURE_INTERNAL, FEATURE_INTERNAL,
FEATURE_ITEM, FEATURE_ITEM,
FEATURE_AUDIO, FEATURE_AUDIO,
FEATURE_VIDEO, FEATURE_VIDEO,
FEATURE_IMAGE, FEATURE_IMAGE,
FEATURE_FLASH, FEATURE_FLASH,
FEATURE_TRASH, FEATURE_TRASH,
FEATURE_FAVORITE, FEATURE_FAVORITE,
FEATURE_SEARCH, FEATURE_SEARCH,
FEATURE_INVALID FEATURE_INVALID
}; };

Loading…
Cancel
Save