Skip to content

O
OpenBoard
Commit 244c5c07 authored by Yimgo's avatar Yimgo
Browse files
Options

Merge branch 'master' into widget_fix

parents 23bf38ed afd70ddc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 325 additions and 183 deletions
ReleaseNotes.pdf
View file @ 244c5c07
No preview for this file type
Sankore_3.1.pro
View file @ 244c5c07
...@@ -11,10 +11,20 @@ linux-g++-64 { ...@@ -11,10 +11,20 @@ linux-g++-64 {
CONFIG += link_prl CONFIG += link_prl
} }
linux-g++-32 {
CONFIG += link_prl
}
linux-g++ {
CONFIG += link_prl
}
VERSION_MAJ = 2 VERSION_MAJ = 2
VERSION_MIN = 00 VERSION_MIN = 00
VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
VERSION_PATCH = 01 VERSION_PATCH = 02
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION = $$replace(VERSION, "\\.r", "") VERSION = $$replace(VERSION, "\\.r", "")
...@@ -352,6 +362,7 @@ macx { ...@@ -352,6 +362,7 @@ macx {
linux-g++ { linux-g++ {
LIBS += -lcrypto LIBS += -lcrypto
LIBS += -lX11
QMAKE_CFLAGS += -fopenmp QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp QMAKE_LFLAGS += -fopenmp
...@@ -367,6 +378,7 @@ linux-g++ { ...@@ -367,6 +378,7 @@ linux-g++ {
linux-g++-32 { linux-g++-32 {
LIBS += -lcrypto LIBS += -lcrypto
LIBS += -lX11
QMAKE_CFLAGS += -fopenmp QMAKE_CFLAGS += -fopenmp
QMAKE_CXXFLAGS += -fopenmp QMAKE_CXXFLAGS += -fopenmp
QMAKE_LFLAGS += -fopenmp QMAKE_LFLAGS += -fopenmp
......
release.win7.vc9.bat
View file @ 244c5c07
REM -------------------------------------------------------------------- REM --------------------------------------------------------------------
REM This program is free software: you can redistribute it and/or modify REM This program is free software: you can redistribute it and/or modify
REM it under the terms of the GNU General Public License as published by REM it under the terms of the GNU General Public License as published by
REM the Free Software Foundation, either version 3 of the License, or REM the Free Software Foundation, either version 2 of the License, or
REM (at your option) any later version. REM (at your option) any later version.
REM REM
REM This program is distributed in the hope that it will be useful, REM This program is distributed in the hope that it will be useful,
...@@ -18,6 +18,7 @@ set QT_BIN=%QT_DIR%\bin ...@@ -18,6 +18,7 @@ set QT_BIN=%QT_DIR%\bin
set PROGRAMS_FILE_PATH=C:\Program Files set PROGRAMS_FILE_PATH=C:\Program Files
set SEVEN_ZIP_EXE="%PROGRAMS_FILE_PATH%\7-Zip\7z.exe"
set GIT_BIN=%PROGRAMS_FILE_PATH%\Git\bin set GIT_BIN=%PROGRAMS_FILE_PATH%\Git\bin
set VS_BIN=%PROGRAMS_FILE_PATH%\Microsoft Visual Studio 9.0\VC\bin set VS_BIN=%PROGRAMS_FILE_PATH%\Microsoft Visual Studio 9.0\VC\bin
set WIN_SDK_BIN=%PROGRAMS_FILE_PATH%\Microsoft SDKs\Windows\v6.0A\Bin set WIN_SDK_BIN=%PROGRAMS_FILE_PATH%\Microsoft SDKs\Windows\v6.0A\Bin
...@@ -46,7 +47,9 @@ set EDITION=MNEMIS_EDITION ...@@ -46,7 +47,9 @@ set EDITION=MNEMIS_EDITION
%LRELEASE% Sankore_3.1.pro %LRELEASE% Sankore_3.1.pro
%LRELEASE% %BASE_QT_TRANSLATIONS_DIRECTORY%\translations.pro %LRELEASE% %BASE_QT_TRANSLATIONS_DIRECTORY%\translations.pro
REM set /p VERSION= < build\win32\release\version set /p VERSION= < build\win32\release\version
REM remove the last character that is a space
set VERSION=%VERSION: =%
REM git rev-list --tags --max-count=1 > tmp REM git rev-list --tags --max-count=1 > tmp
REM set /p LAST_TAG= < tmp REM set /p LAST_TAG= < tmp
REM erase tmp REM erase tmp
...@@ -78,3 +81,19 @@ set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe ...@@ -78,3 +81,19 @@ set INSTALLER_PATH=.\install\win32\%INSTALLER_NAME%.exe
call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%" call "%INNO_EXE%" "Sankore 3.1.iss" /F"%INSTALLER_NAME%"
set INSTALL_DIRECTORY=install\win32\
xcopy *.pdf %INSTALL_DIRECTORY%
cd %INSTALL_DIRECTORY%
call %SEVEN_ZIP_EXE% a Open-Sankor_Windows_%VERSION%.zip *.exe *.pdf
cd ..\..\
GOTO END
:EXIT_WITH_ERROR
echo "Error found"
GOTO :EOF
:END
echo "Open-Sankore's build finished"
:EOF
resources/etc/freezedWidgetWrapper.html
View file @ 244c5c07
...@@ -9,9 +9,19 @@ ...@@ -9,9 +9,19 @@
width: 100%; width: 100%;
} }
div{ #freezed{
text-align: center; text-align: center;
border: 5px #ccc outset; border: 5px solid #ccc;
border-radius: 80px;
box-shadow: inset 0 0 30px rgba(66,66,66,0.5);
}
.loading{
color: #999;
font-weight: bold;
font-size: large;
margin-top: 5px;
margin-left: 5px;
} }
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
...@@ -42,6 +52,6 @@ ...@@ -42,6 +52,6 @@
</script> </script>
</head> </head>
<body> <body>
<div id="freezed">Widget freezed.</div> <div id="freezed"><img src="img/loading.gif"/><div class="loading">Loading ...</div></div>
</body> </body>
</html> </html>
\ No newline at end of file
resources/library/applications/Calculatrice.wgt/js/ubw-main.js
View file @ 244c5c07
...@@ -350,7 +350,6 @@ function init(){ ...@@ -350,7 +350,6 @@ function init(){
function compute(){ function compute(){
var result; var result;
//alert(calc)
if(calc.length <= 1) if(calc.length <= 1)
result = eval(calc); result = eval(calc);
else{ else{
...@@ -362,7 +361,6 @@ function init(){ ...@@ -362,7 +361,6 @@ function init(){
operation = (calc.indexOf("+", 0) != -1)?calc.charAt(calc.indexOf("+", 0)):((calc.indexOf("*", 0) != -1)?calc.charAt(calc.indexOf("*", 0)):((calc.indexOf("/", 0) != -1)?calc.charAt(calc.indexOf("/", 0)):((calc.indexOf("-", 0) != -1)?calc.charAt(calc.indexOf("-", 0)):""))); operation = (calc.indexOf("+", 0) != -1)?calc.charAt(calc.indexOf("+", 0)):((calc.indexOf("*", 0) != -1)?calc.charAt(calc.indexOf("*", 0)):((calc.indexOf("/", 0) != -1)?calc.charAt(calc.indexOf("/", 0)):((calc.indexOf("-", 0) != -1)?calc.charAt(calc.indexOf("-", 0)):"")));
fNumber = fMinus + calc.substring(0, calc.indexOf(operation, 0)); fNumber = fMinus + calc.substring(0, calc.indexOf(operation, 0));
lNumber = calc.substring(calc.indexOf(operation, 0)+1, calc.length); lNumber = calc.substring(calc.indexOf(operation, 0)+1, calc.length);
//alert(fNumber + " | " + operation + " | " + lNumber)
result = calcIt(fNumber, operation, lNumber); result = calcIt(fNumber, operation, lNumber);
} }
...@@ -391,10 +389,10 @@ function init(){ ...@@ -391,10 +389,10 @@ function init(){
lCount = (lNumber.indexOf(".", 0) != -1)?lNumber.substring(lNumber.indexOf(".", 0)+1, lNumber.length):""; lCount = (lNumber.indexOf(".", 0) != -1)?lNumber.substring(lNumber.indexOf(".", 0)+1, lNumber.length):"";
length = (fCount.length >= lCount.length)?fCount.length:lCount.length; length = (fCount.length >= lCount.length)?fCount.length:lCount.length;
length = Math.pow(10, length); length = Math.pow(10, length);
fNumber = fNumber * length; fNumber = Math.round(fNumber * length);
lNumber = lNumber * length; lNumber = Math.round(lNumber * length);
switch(operation){ switch(operation){
case "+": case "+":
result = (fNumber + lNumber)/length; result = (fNumber + lNumber)/length;
break; break;
case "-": case "-":
...@@ -516,10 +514,27 @@ function init(){ ...@@ -516,10 +514,27 @@ function init(){
displayTrunk = displayTrunk.substr(0, displayTrunk.length-1); displayTrunk = displayTrunk.substr(0, displayTrunk.length-1);
}; };
calc += String(char); if(calc == "0"){
displayTrunk += String(char); if(char != "0"){
historyTrunk += String(char); if(char != "."){
lastchar.type = "Number"; calc = String(char);
displayTrunk = String(char);
historyTrunk = String(char);
lastchar.type = "Number";
} else{
calc += String(char);
displayTrunk += String(char);
historyTrunk += String(char);
lastchar.type = "Number";
}
}
} else {
char = (char == ".")?((displayTrunk.indexOf(".", 0) != -1)?"":"."):char;
calc += String(char);
displayTrunk += String(char);
historyTrunk += String(char);
lastchar.type = "Number";
}
} }
// char is an operator // char is an operator
else { else {
......
resources/library/interactivities/Ass images.wgt/css/basic.css
View file @ 244c5c07
...@@ -64,7 +64,7 @@ body{ ...@@ -64,7 +64,7 @@ body{
.sub_cont{ .sub_cont{
width: 100%; width: 100%;
padding: 0; padding: 0;
margin: 20px 0 0 0; margin: 20px 0 5px 0;
min-height: 60px; min-height: 60px;
} }
...@@ -84,7 +84,7 @@ body{ ...@@ -84,7 +84,7 @@ body{
} }
.imgs_answers_gray{ .imgs_answers_gray{
} }
.imgs_answers_green{ .imgs_answers_green{
...@@ -114,11 +114,12 @@ body{ ...@@ -114,11 +114,12 @@ body{
min-height: 40px; min-height: 40px;
max-height: 60px; max-height: 60px;
float: right; float: right;
overflow: auto; overflow-x: hidden;
background-color: #ccc; background-color: #ccc;
border-top-left-radius: 10px; border-top-left-radius: 10px;
border-bottom-left-radius: 10px; border-bottom-left-radius: 10px;
padding-left: 10px; padding-left: 10px;
word-break: break-all;
} }
.close_cont{ .close_cont{
...@@ -207,7 +208,7 @@ body{ ...@@ -207,7 +208,7 @@ body{
} }
.dropBack{ .dropBack{
} }
/* new design */ /* new design */
...@@ -417,5 +418,5 @@ body{ ...@@ -417,5 +418,5 @@ body{
} }
.open{ .open{
} }
\ No newline at end of file
resources/library/interactivities/Ass sons.wgt/css/basic.css
View file @ 244c5c07
...@@ -218,6 +218,7 @@ body{ ...@@ -218,6 +218,7 @@ body{
overflow-x: hidden; overflow-x: hidden;
float: right; float: right;
margin-left: 20px; margin-left: 20px;
word-break: break-all;
} }
.play, .stop{ .play, .stop{
......
resources/library/interactivities/Cat images.wgt/css/basic.css
View file @ 244c5c07
...@@ -150,16 +150,16 @@ body{ ...@@ -150,16 +150,16 @@ body{
height: 30px; height: 30px;
float: right; float: right;
cursor: pointer; cursor: pointer;
background-color: white; background-color: transparent;
border: none; border: none;
} }
.del_category{ .del_category{
background-image: url(../img/minus.png);
} }
.add_category{ .add_category{
background-image: url(../img/plus.png);
} }
.cat_desc{ .cat_desc{
......
resources/library/interactivities/Cat images.wgt/js/script.js
View file @ 244c5c07
...@@ -5,7 +5,7 @@ var sankoreLang = { ...@@ -5,7 +5,7 @@ var sankoreLang = {
second_desc: "Even numbers", second_desc: "Even numbers",
enter: "Enter your category name here ...", enter: "Enter your category name here ...",
add: "Add new block", add: "Add new block",
wgt_name: "Order images", wgt_name: "Categorize images",
reload: "Reload", reload: "Reload",
slate: "Wood", slate: "Wood",
pad: "Pad", pad: "Pad",
...@@ -160,8 +160,8 @@ function start(){ ...@@ -160,8 +160,8 @@ function start(){
$("<div class='close_cont'>").appendTo(container); $("<div class='close_cont'>").appendTo(container);
container.find(".imgs_cont").each(function(){ container.find(".imgs_cont").each(function(){
$("<button class='del_category'>-</button>").appendTo($(this)); $("<button class='del_category'></button>").appendTo($(this));
$("<button class='add_category'>+</button>").appendTo($(this)); $("<button class='add_category'></button>").appendTo($(this));
$(this).attr("ondragenter", "return false;") $(this).attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;")
...@@ -558,8 +558,8 @@ function addCategory(obj){ ...@@ -558,8 +558,8 @@ function addCategory(obj){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container); $("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container); var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'>").appendTo(tmp_div); $("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
...@@ -579,8 +579,8 @@ function addContainer(){ ...@@ -579,8 +579,8 @@ function addContainer(){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container); $("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container); var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'/>").appendTo(tmp_div); $("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'/>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;")
...@@ -787,7 +787,6 @@ function onDropTarget(obj, event) { ...@@ -787,7 +787,6 @@ function onDropTarget(obj, event) {
} }
} }
} }
exportData();
} }
else { else {
alert ("Your browser does not support the dataTransfer object."); alert ("Your browser does not support the dataTransfer object.");
......
resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js
View file @ 244c5c07
...@@ -158,8 +158,8 @@ function start(){ ...@@ -158,8 +158,8 @@ function start(){
$("<div class='close_cont'>").appendTo(container); $("<div class='close_cont'>").appendTo(container);
container.find(".imgs_cont").each(function(){ container.find(".imgs_cont").each(function(){
$("<button class='del_category'>-</button>").appendTo($(this)); $("<button class='del_category'></button>").appendTo($(this));
$("<button class='add_category'>+</button>").appendTo($(this)); $("<button class='add_category'></button>").appendTo($(this));
$(this).attr("ondragenter", "return false;") $(this).attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;")
...@@ -556,8 +556,8 @@ function addCategory(obj){ ...@@ -556,8 +556,8 @@ function addCategory(obj){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container); $("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container); var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'>").appendTo(tmp_div); $("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
...@@ -577,8 +577,8 @@ function addContainer(){ ...@@ -577,8 +577,8 @@ function addContainer(){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container); $("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container); var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'/>").appendTo(tmp_div); $("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'/>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
......
resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js
View file @ 244c5c07
...@@ -158,8 +158,8 @@ function start(){ ...@@ -158,8 +158,8 @@ function start(){
$("<div class='close_cont'>").appendTo(container); $("<div class='close_cont'>").appendTo(container);
container.find(".imgs_cont").each(function(){ container.find(".imgs_cont").each(function(){
$("<button class='del_category'>-</button>").appendTo($(this)); $("<button class='del_category'></button>").appendTo($(this));
$("<button class='add_category'>+</button>").appendTo($(this)); $("<button class='add_category'></button>").appendTo($(this));
$(this).attr("ondragenter", "return false;") $(this).attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;")
...@@ -559,8 +559,8 @@ function addCategory(obj){ ...@@ -559,8 +559,8 @@ function addCategory(obj){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container); $("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container); var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'>").appendTo(tmp_div); $("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
...@@ -580,8 +580,8 @@ function addContainer(){ ...@@ -580,8 +580,8 @@ function addContainer(){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container); $("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container); var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'/>").appendTo(tmp_div); $("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'/>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container); $("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container); $("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;") imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;") .attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
......
resources/library/interactivities/Choisir.wgt/css/basic.css
View file @ 244c5c07
...@@ -149,12 +149,10 @@ body{ ...@@ -149,12 +149,10 @@ body{
font-family: Verdana,Arial,Helvetica,sans-serif; font-family: Verdana,Arial,Helvetica,sans-serif;
font-size: small; font-size: small;
border: 3px solid #ccc; border: 3px solid #ccc;
-webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
-moz-box-shadow: #dadada -1px 0 4px;
-webkit-box-shadow: #dadada -1px 0 4px;
box-shadow: #dadada -1px 0 4px; box-shadow: #dadada -1px 0 4px;
color: white; color: white;
word-break: break-all;
} }
.qstContentDisplay{ .qstContentDisplay{
...@@ -169,6 +167,7 @@ body{ ...@@ -169,6 +167,7 @@ body{
border: 1px solid #DFDFDE; border: 1px solid #DFDFDE;
border-top-left-radius: 10px; border-top-left-radius: 10px;
border-bottom-left-radius: 10px; border-bottom-left-radius: 10px;
word-break: break-all;
} }
.ansDiv{ .ansDiv{
...@@ -222,12 +221,10 @@ body{ ...@@ -222,12 +221,10 @@ body{
overflow-x: hidden; overflow-x: hidden;
float: left; float: left;
border: 3px solid #ccc; border: 3px solid #ccc;
-webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
-moz-box-shadow: #dadada -1px 0 4px;
-webkit-box-shadow: #dadada -1px 0 4px;
box-shadow: #dadada -1px 0 4px; box-shadow: #dadada -1px 0 4px;
color: white; color: white;
word-break: break-all;
} }
.ansContentDisplay{ .ansContentDisplay{
...@@ -244,6 +241,7 @@ body{ ...@@ -244,6 +241,7 @@ body{
border-top-left-radius: 10px; border-top-left-radius: 10px;
border-bottom-left-radius: 10px; border-bottom-left-radius: 10px;
color: white; color: white;
word-break: break-all;
} }
.ansDelete{ .ansDelete{
......
resources/library/interactivities/Ordre images.wgt/css/basic.css
View file @ 244c5c07
...@@ -60,7 +60,7 @@ body{ ...@@ -60,7 +60,7 @@ body{
.sub_cont{ .sub_cont{
width: 100%; width: 100%;
padding: 0; padding: 0;
margin: 20px 0 0 0; margin: 20px 0 5px 0;
min-height: 60px; min-height: 60px;
} }
...@@ -93,6 +93,7 @@ body{ ...@@ -93,6 +93,7 @@ body{
border-top-left-radius: 10px; border-top-left-radius: 10px;
border-bottom-left-radius: 10px; border-bottom-left-radius: 10px;
padding-left: 10px; padding-left: 10px;
word-break: break-all;
} }
.close_cont{ .close_cont{
......
resources/library/interactivities/Ordre lettres.wgt/css/basic.css
View file @ 244c5c07
...@@ -172,6 +172,7 @@ body{ ...@@ -172,6 +172,7 @@ body{
overflow-x: hidden; overflow-x: hidden;
float: right; float: right;
margin-left: 20px; margin-left: 20px;
word-break: break-all;
} }
.play, .stop{ .play, .stop{
...@@ -205,16 +206,15 @@ body{ ...@@ -205,16 +206,15 @@ body{
.audio_answer{ .audio_answer{
min-height: 50px; min-height: 50px;
min-width: 200px;
max-width: 700px;
margin: 5px 10px; margin: 5px 10px;
padding: 0 10px; padding: 0 10px;
background-color: white; background-color: white;
display: inline-block;
position: relative;
border: 1px solid #ccc; border: 1px solid #ccc;
-moz-box-shadow: #ccc -1px 0 4px;
-webkit-box-shadow: #ccc -1px 0 4px;
box-shadow: #ccc -1px 0 4px; box-shadow: #ccc -1px 0 4px;
font-size: 230%; font-size: 230%;
word-wrap: break-word;
} }
/*new design*/ /*new design*/
......
resources/library/interactivities/Ordre lettres.wgt/js/script.js
View file @ 244c5c07
...@@ -337,7 +337,7 @@ function showExample(){ ...@@ -337,7 +337,7 @@ function showExample(){
var audio_block = $("<div class='audio_block'>").appendTo(text); var audio_block = $("<div class='audio_block'>").appendTo(text);
$("<div class='play'>").appendTo(audio_block); $("<div class='play'>").appendTo(audio_block);
$("<div class='replay'>").appendTo(audio_block); $("<div class='replay'>").appendTo(audio_block);
var source = $("<source/>").attr("src", "objects/beep.wav"); var source = $("<source/>").attr("src", "objects/beep.mp3");
var audio = $("<audio>").appendTo(audio_block); var audio = $("<audio>").appendTo(audio_block);
audio.append(source); audio.append(source);
$("<input type='hidden'/>").appendTo(audio_block); $("<input type='hidden'/>").appendTo(audio_block);
......
resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js
View file @ 244c5c07
...@@ -331,7 +331,7 @@ function showExample(){ ...@@ -331,7 +331,7 @@ function showExample(){
var audio_block = $("<div class='audio_block'>").appendTo(text); var audio_block = $("<div class='audio_block'>").appendTo(text);
$("<div class='play'>").appendTo(audio_block); $("<div class='play'>").appendTo(audio_block);
$("<div class='replay'>").appendTo(audio_block); $("<div class='replay'>").appendTo(audio_block);
var source = $("<source/>").attr("src", "../../objects/beep.wav"); var source = $("<source/>").attr("src", "objects/exemple.mp3");
var audio = $("<audio>").appendTo(audio_block); var audio = $("<audio>").appendTo(audio_block);
audio.append(source); audio.append(source);
$("<input type='hidden'/>").appendTo(audio_block); $("<input type='hidden'/>").appendTo(audio_block);
......
resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js
View file @ 244c5c07
...@@ -332,7 +332,7 @@ function showExample(){ ...@@ -332,7 +332,7 @@ function showExample(){
var audio_block = $("<div class='audio_block'>").appendTo(text); var audio_block = $("<div class='audio_block'>").appendTo(text);
$("<div class='play'>").appendTo(audio_block); $("<div class='play'>").appendTo(audio_block);
$("<div class='replay'>").appendTo(audio_block); $("<div class='replay'>").appendTo(audio_block);
var source = $("<source/>").attr("src", "../../objects/beep.wav"); var source = $("<source/>").attr("src", "objects/example.mp3");
var audio = $("<audio>").appendTo(audio_block); var audio = $("<audio>").appendTo(audio_block);
audio.append(source); audio.append(source);
$("<input type='hidden'/>").appendTo(audio_block); $("<input type='hidden'/>").appendTo(audio_block);
......
resources/library/interactivities/Selectionner.wgt/css/basic.css
View file @ 244c5c07
...@@ -94,6 +94,7 @@ body{ ...@@ -94,6 +94,7 @@ body{
border-bottom-left-radius: 10px; border-bottom-left-radius: 10px;
padding-left: 10px; padding-left: 10px;
display: block; display: block;
word-break: break-all;
} }
.close_cont{ .close_cont{
......
src/board/UBBoardPaletteManager.cpp
View file @ 244c5c07
...@@ -884,6 +884,10 @@ void UBBoardPaletteManager::addItemToLibrary() ...@@ -884,6 +884,10 @@ void UBBoardPaletteManager::addItemToLibrary()
#ifdef USE_WEB_WIDGET #ifdef USE_WEB_WIDGET
mpLibWidget->libNavigator()->libraryWidget()->libraryController()->importImageOnLibrary(image); mpLibWidget->libNavigator()->libraryWidget()->libraryController()->importImageOnLibrary(image);
#else
QDateTime now = QDateTime::currentDateTime();
QString capturedName = tr("CapturedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss") + ".png";
mpFeaturesWidget->importImage(image, capturedName);
#endif #endif
} }
......
src/board/UBFeaturesController.cpp
View file @ 244c5c07
This diff is collapsed.
src/board/UBFeaturesController.h
View file @ 244c5c07
...@@ -33,7 +33,8 @@ enum UBFeatureElementType ...@@ -33,7 +33,8 @@ enum UBFeatureElementType
FEATURE_ITEM, FEATURE_ITEM,
FEATURE_TRASH, FEATURE_TRASH,
FEATURE_FAVORITE, FEATURE_FAVORITE,
FEATURE_SEARCH FEATURE_SEARCH,
FEATURE_INVALID
}; };
class UBFeature class UBFeature
...@@ -105,6 +106,7 @@ public: ...@@ -105,6 +106,7 @@ public:
UBFeature moveItemToFolder( const QUrl &url, const UBFeature &destination ); UBFeature moveItemToFolder( const QUrl &url, const UBFeature &destination );
UBFeature copyItemToFolder( const QUrl &url, const UBFeature &destination ); UBFeature copyItemToFolder( const QUrl &url, const UBFeature &destination );
void moveExternalData(const QUrl &url, const UBFeature &destination);
void rescanModel(); void rescanModel();
void siftElements(const QString &pSiftValue); void siftElements(const QString &pSiftValue);
...@@ -120,13 +122,15 @@ public: ...@@ -120,13 +122,15 @@ public:
void addNewFolder(const QString &name); void addNewFolder(const QString &name);
void addToFavorite( const QUrl &path ); void addToFavorite( const QUrl &path );
void removeFromFavorite(const QUrl &path, bool deleteManualy = false); void removeFromFavorite(const QUrl &path, bool deleteManualy = false);
UBFeature importImage( const QImage &image, const UBFeature &destination ); void importImage(const QImage &image, const QString &fileName = QString());
void importImage( const QImage &image, const UBFeature &destination, const QString &fileName = QString() );
void fileSystemScan(const QUrl &currPath, const QString & currVirtualPath); void fileSystemScan(const QUrl &currPath, const QString & currVirtualPath);
static UBFeatureElementType fileTypeFromUrl( const QString &path );
static QString fileNameFromUrl( const QUrl &url ); static QString fileNameFromUrl( const QUrl &url );
static QPixmap thumbnailForFile( const QString &path ); static QPixmap getIcon( const QString &path, UBFeatureElementType pFType );
static bool isDeletable( const QUrl &url ); static bool isDeletable( const QUrl &url );
static char featureTypeSplitter() {return ':';} static char featureTypeSplitter() {return ':';}
...@@ -153,7 +157,7 @@ private: ...@@ -153,7 +157,7 @@ private:
void loadFavoriteList(); void loadFavoriteList();
void saveFavoriteList(); void saveFavoriteList();
static UBFeatureElementType fileTypeFromUrl( const QString &path );
QList <UBFeature> *featuresList; QList <UBFeature> *featuresList;
...@@ -204,7 +208,7 @@ private: ...@@ -204,7 +208,7 @@ private:
public: public:
UBFeature trashElement; UBFeature trashElement;
UBFeature getParentFeatureForUrl( const QUrl &url ); UBFeature getDestinationFeatureForUrl( const QUrl &url );
}; };
......
src/domain/UBAbstractWidget.cpp
View file @ 244c5c07
...@@ -172,8 +172,10 @@ bool UBAbstractWidget::hasEmbededFlash() ...@@ -172,8 +172,10 @@ bool UBAbstractWidget::hasEmbededFlash()
void UBAbstractWidget::resize(qreal width, qreal height) void UBAbstractWidget::resize(qreal width, qreal height)
{ {
QWebView::page()->setViewportSize(QSize(width, height)); qreal w = qMax((qreal)mNominalSize.width(), width);
QWebView::setFixedSize(QSize(width, height)); qreal h = qMax((qreal)mNominalSize.height(), height);
QWebView::page()->setViewportSize(QSize(w, h));
QWebView::setFixedSize(QSize(w, h));
} }
......
src/gui/UBDocumentNavigator.cpp
View file @ 244c5c07
...@@ -161,6 +161,7 @@ void UBDocumentNavigator::refreshScene() ...@@ -161,6 +161,7 @@ void UBDocumentNavigator::refreshScene()
int rowIndex = i / mNbColumns; int rowIndex = i / mNbColumns;
item.Place(rowIndex, columnIndex, mThumbnailWidth, thumbnailHeight); item.Place(rowIndex, columnIndex, mThumbnailWidth, thumbnailHeight);
} }
scene()->setSceneRect(scene()->itemsBoundingRect());
} }
/** /**
......
src/gui/UBFeaturesWidget.cpp
View file @ 244c5c07
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include "UBFeaturesWidget.h" #include "UBFeaturesWidget.h"
#include "domain/UBAbstractWidget.h" #include "domain/UBAbstractWidget.h"
#include "gui/UBThumbnailWidget.h" #include "gui/UBThumbnailWidget.h"
#include "gui/UBLibraryWidget.h"
#include "frameworks/UBFileSystemUtils.h" #include "frameworks/UBFileSystemUtils.h"
#include "core/UBApplication.h" #include "core/UBApplication.h"
#include "core/UBDownloadManager.h" #include "core/UBDownloadManager.h"
...@@ -18,7 +17,10 @@ const int FeatureListBorderOffset = 10; ...@@ -18,7 +17,10 @@ const int FeatureListBorderOffset = 10;
const char featureTypeSplitter = ':'; const char featureTypeSplitter = ':';
static const QString mimeSankoreFeatureTypes = "Sankore/featureTypes"; static const QString mimeSankoreFeatureTypes = "Sankore/featureTypes";
UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name):UBDockPaletteWidget(parent), imageGatherer(NULL) UBFeaturesWidget::UBFeaturesWidget(QWidget *parent, const char *name)
: UBDockPaletteWidget(parent)
, imageGatherer(NULL)
, mkFolderDlg(NULL)
{ {
setObjectName(name); setObjectName(name);
...@@ -108,6 +110,9 @@ void UBFeaturesWidget::currentSelected(const QModelIndex &current) ...@@ -108,6 +110,9 @@ void UBFeaturesWidget::currentSelected(const QModelIndex &current)
return; return;
} }
//Calling to reset the model for listView. Maybe separate function needed
controller->searchStarted("", mNavigator->listView());
QString objName = sender()->objectName(); QString objName = sender()->objectName();
if (objName.isEmpty()) { if (objName.isEmpty()) {
...@@ -159,10 +164,22 @@ void UBFeaturesWidget::currentSelected(const QModelIndex &current) ...@@ -159,10 +164,22 @@ void UBFeaturesWidget::currentSelected(const QModelIndex &current)
void UBFeaturesWidget::createNewFolder() void UBFeaturesWidget::createNewFolder()
{ {
UBNewFolderDlg dlg; if (!mkFolderDlg)
if(QDialog::Accepted == dlg.exec()) { {
controller->addNewFolder(dlg.folderName()); mkFolderDlg = new UBNewFolderDlg(this);
connect (mkFolderDlg, SIGNAL(accepted()), this, SLOT(addFolder()));
} }
mkFolderDlg->setWindowFlags(Qt::WindowStaysOnTopHint);
mkFolderDlg->resize(this->size().width()-20 ,80);
mkFolderDlg->move(5,this->size().height()-200);
mkFolderDlg->show();
}
void UBFeaturesWidget::addFolder()
{
if (mkFolderDlg)
controller->addNewFolder(mkFolderDlg->folderName());
} }
void UBFeaturesWidget::deleteElements( const UBFeaturesMimeData * mimeData ) void UBFeaturesWidget::deleteElements( const UBFeaturesMimeData * mimeData )
...@@ -334,6 +351,16 @@ void UBFeaturesWidget::removeElementsFromFavorite() ...@@ -334,6 +351,16 @@ void UBFeaturesWidget::removeElementsFromFavorite()
controller->refreshModels(); controller->refreshModels();
} }
void UBFeaturesWidget::resizeEvent(QResizeEvent *event)
{
UBDockPaletteWidget::resizeEvent(event);
if (mkFolderDlg)
{
mkFolderDlg->resize(this->size().width()-20 ,80);
mkFolderDlg->move(5,this->size().height()-200);
}
}
void UBFeaturesWidget::switchToListView() void UBFeaturesWidget::switchToListView()
{ {
stackedWidget->setCurrentIndex(ID_LISTVIEW); stackedWidget->setCurrentIndex(ID_LISTVIEW);
...@@ -357,6 +384,10 @@ QStringList UBFeaturesMimeData::formats() const ...@@ -357,6 +384,10 @@ QStringList UBFeaturesMimeData::formats() const
return QMimeData::formats(); return QMimeData::formats();
} }
void UBFeaturesWidget::importImage(const QImage &image, const QString &fileName)
{
controller->importImage(image, fileName);
}
UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* name ) UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* name )
: QListView(parent) : QListView(parent)
...@@ -862,6 +893,8 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act ...@@ -862,6 +893,8 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
Q_UNUSED(row) Q_UNUSED(row)
const UBFeaturesMimeData *fMimeData = qobject_cast<const UBFeaturesMimeData*>(mimeData); const UBFeaturesMimeData *fMimeData = qobject_cast<const UBFeaturesMimeData*>(mimeData);
UBFeaturesController *curController = qobject_cast<UBFeaturesController *>(QObject::parent());
bool dataFromSameModel = false; bool dataFromSameModel = false;
if (fMimeData) if (fMimeData)
...@@ -876,12 +909,12 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act ...@@ -876,12 +909,12 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
UBFeature parentFeature; UBFeature parentFeature;
if (!parent.isValid()) { if (!parent.isValid()) {
parentFeature = dynamic_cast<UBFeaturesWidget *>(QObject::parent())->getFeaturesController()->getCurrentElement(); parentFeature = curController->getCurrentElement();
} else { } else {
parentFeature = parent.data( Qt::UserRole + 1).value<UBFeature>(); parentFeature = parent.data( Qt::UserRole + 1).value<UBFeature>();
} }
if (mimeData->hasUrls()) { if (dataFromSameModel) {
QList<UBFeature> featList = fMimeData->features(); QList<UBFeature> featList = fMimeData->features();
for (int i = 0; i < featList.count(); i++) { for (int i = 0; i < featList.count(); i++) {
UBFeature sourceElement; UBFeature sourceElement;
...@@ -890,10 +923,16 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act ...@@ -890,10 +923,16 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
moveData(sourceElement, parentFeature, Qt::MoveAction); moveData(sourceElement, parentFeature, Qt::MoveAction);
} }
} }
} else if ( mimeData->hasImage() ) { } else if (mimeData->hasUrls()) {
QList<QUrl> urlList = mimeData->urls();
foreach (QUrl curUrl, urlList) {
qDebug() << "URl catched is " << curUrl.toLocalFile();
curController->moveExternalData(curUrl, parentFeature);
}
} else if (mimeData->hasImage()) {
QImage image = qvariant_cast<QImage>( mimeData->imageData() ); QImage image = qvariant_cast<QImage>( mimeData->imageData() );
UBFeature element = dynamic_cast<UBFeaturesWidget *>(QObject::parent())->getFeaturesController()->importImage( image, parentFeature ); curController->importImage( image, parentFeature );
addItem( element );
} }
return true; return true;
...@@ -1019,7 +1058,7 @@ void UBFeaturesModel::moveData(const UBFeature &source, const UBFeature &destina ...@@ -1019,7 +1058,7 @@ void UBFeaturesModel::moveData(const UBFeature &source, const UBFeature &destina
curFeature.setFullPath(newPath); curFeature.setFullPath(newPath);
} }
} }
// processing copy or move action for real FS // processing copy or move action for virtual FS
if (action == Qt::CopyAction) { if (action == Qt::CopyAction) {
copyFeature.setFullVirtualPath(newVirtualPath); copyFeature.setFullVirtualPath(newVirtualPath);
} else { } else {
......
src/gui/UBFeaturesWidget.h
View file @ 244c5c07
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "api/UBWidgetUniboardAPI.h" #include "api/UBWidgetUniboardAPI.h"
#include "UBFeaturesActionBar.h" #include "UBFeaturesActionBar.h"
#include "UBRubberBand.h" #include "UBRubberBand.h"
#include "gui/UBLibraryWidget.h"
#define THUMBNAIL_WIDTH 400 #define THUMBNAIL_WIDTH 400
#define ID_LISTVIEW 0 #define ID_LISTVIEW 0
...@@ -56,6 +57,7 @@ public: ...@@ -56,6 +57,7 @@ public:
|| mode == eUBDockPaletteWidget_DESKTOP; || mode == eUBDockPaletteWidget_DESKTOP;
} }
UBFeaturesController * getFeaturesController() const { return controller; } UBFeaturesController * getFeaturesController() const { return controller; }
void importImage(const QImage &image, const QString &fileName = QString());
static const int minThumbnailSize = 20; static const int minThumbnailSize = 20;
static const int maxThumbnailSize = 100; static const int maxThumbnailSize = 100;
...@@ -70,6 +72,7 @@ private slots: ...@@ -70,6 +72,7 @@ private slots:
void currentSelected( const QModelIndex & ); void currentSelected( const QModelIndex & );
void searchStarted( const QString & ); void searchStarted( const QString & );
void createNewFolder(); void createNewFolder();
void addFolder();
void deleteElements( const UBFeaturesMimeData * ); void deleteElements( const UBFeaturesMimeData * );
void addToFavorite( const UBFeaturesMimeData *); void addToFavorite( const UBFeaturesMimeData *);
void removeFromFavorite( const UBFeaturesMimeData * ); void removeFromFavorite( const UBFeaturesMimeData * );
...@@ -81,6 +84,7 @@ private slots: ...@@ -81,6 +84,7 @@ private slots:
void rescanModel(); void rescanModel();
private: private:
void resizeEvent(QResizeEvent *event);
void switchToListView(); void switchToListView();
void switchToProperties(); void switchToProperties();
void switchToWebView(); void switchToWebView();
...@@ -96,6 +100,7 @@ private: ...@@ -96,6 +100,7 @@ private:
QStackedWidget *stackedWidget; QStackedWidget *stackedWidget;
int currentStackedWidget; int currentStackedWidget;
UBDownloadHttpFile* imageGatherer; UBDownloadHttpFile* imageGatherer;
UBNewFolderDlg *mkFolderDlg;
}; };
......
src/gui/UBLibraryWidget.cpp
View file @ 244c5c07
...@@ -547,7 +547,6 @@ UBNewFolderDlg::UBNewFolderDlg(QWidget *parent, const char *name):QDialog(parent ...@@ -547,7 +547,6 @@ UBNewFolderDlg::UBNewFolderDlg(QWidget *parent, const char *name):QDialog(parent
, mpAddButton(NULL) , mpAddButton(NULL)
, mpCancelButton(NULL) , mpCancelButton(NULL)
, mpLayout(NULL) , mpLayout(NULL)
, mpHLayout(NULL)
{ {
setObjectName(name); setObjectName(name);
setWindowTitle(tr("Add new folder")); setWindowTitle(tr("Add new folder"));
...@@ -562,15 +561,14 @@ UBNewFolderDlg::UBNewFolderDlg(QWidget *parent, const char *name):QDialog(parent ...@@ -562,15 +561,14 @@ UBNewFolderDlg::UBNewFolderDlg(QWidget *parent, const char *name):QDialog(parent
mpButtons = new QDialogButtonBox(Qt::Horizontal, this); mpButtons = new QDialogButtonBox(Qt::Horizontal, this);
mpLayout = new QVBoxLayout(this); mpLayout = new QVBoxLayout(this);
mpHLayout = new QHBoxLayout(0);
setLayout(mpLayout); setLayout(mpLayout);
mpLayout->addLayout(mpHLayout, 0);
mpHLayout->addWidget(mpLabel, 0); mpLayout->addWidget(mpLabel, 1);
mpHLayout->addWidget(mpLineEdit, 1); mpLayout->addWidget(mpLineEdit);
mpButtons->addButton(mpAddButton,QDialogButtonBox::ActionRole); mpButtons->addButton(mpAddButton,QDialogButtonBox::ActionRole);
mpButtons->addButton(mpCancelButton,QDialogButtonBox::ActionRole); mpButtons->addButton(mpCancelButton,QDialogButtonBox::ActionRole);
mpLayout->addWidget(mpButtons); mpLayout->addWidget(mpButtons, 1,Qt::AlignJustify);
connect(mpAddButton, SIGNAL(clicked()), this, SLOT(accept())); connect(mpAddButton, SIGNAL(clicked()), this, SLOT(accept()));
connect(mpCancelButton, SIGNAL(clicked()), this, SLOT(reject())); connect(mpCancelButton, SIGNAL(clicked()), this, SLOT(reject()));
...@@ -612,11 +610,7 @@ UBNewFolderDlg::~UBNewFolderDlg() ...@@ -612,11 +610,7 @@ UBNewFolderDlg::~UBNewFolderDlg()
delete mpLabel; delete mpLabel;
mpLabel = NULL; mpLabel = NULL;
} }
if(NULL != mpHLayout)
{
delete mpHLayout;
mpHLayout = NULL;
}
if(NULL != mpLayout) if(NULL != mpLayout)
{ {
delete mpLayout; delete mpLayout;
......
src/gui/UBLibraryWidget.h
View file @ 244c5c07
...@@ -119,7 +119,6 @@ private: ...@@ -119,7 +119,6 @@ private:
QPushButton* mpAddButton; QPushButton* mpAddButton;
QPushButton* mpCancelButton; QPushButton* mpCancelButton;
QVBoxLayout* mpLayout; QVBoxLayout* mpLayout;
QHBoxLayout* mpHLayout;
}; };
#endif // UBLIBRARYWIDGET_H #endif // UBLIBRARYWIDGET_H
src/gui/UBTeacherGuideWidget.cpp
View file @ 244c5c07
...@@ -1163,7 +1163,7 @@ void UBTeacherGuideWidget::connectToStylusPalette() ...@@ -1163,7 +1163,7 @@ void UBTeacherGuideWidget::connectToStylusPalette()
connect(UBApplication::mainWindow->actionPlay, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool))); connect(UBApplication::mainWindow->actionPlay, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
connect(UBApplication::mainWindow->actionZoomIn, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool))); connect(UBApplication::mainWindow->actionZoomIn, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
connect(UBApplication::mainWindow->actionZoomOut, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool))); connect(UBApplication::mainWindow->actionZoomOut, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
connect(UBApplication::mainWindow->actionCapture, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool))); connect(UBApplication::mainWindow->actionCapture, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
connect(UBApplication::mainWindow->actionHand, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool))); connect(UBApplication::mainWindow->actionHand, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
connect(UBApplication::mainWindow->actionLine, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool))); connect(UBApplication::mainWindow->actionLine, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
connect(UBApplication::mainWindow->actionText, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool))); connect(UBApplication::mainWindow->actionText, SIGNAL(triggered(bool)), this, SLOT(onTriggeredAction(bool)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment