Commit 52824186 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Add image adjust effect category, i18n splash, fix startup issue

parent 2cd578c6
......@@ -22,6 +22,9 @@
<group list="fade_from_black,fade_to_black,fadein,fadeout">
<text>Fade</text>
</group>
<group list="fade_from_black,fade_to_black,fadein,fadeout">
<text>Image adjustment</text>
</group>
<group list="burningtv,charcoal,dust,frei0r.cartoon,frei0r.dither,frei0r.emboss,frei0r.posterize,frei0r.rgbnoise,frei0r.sigmoidaltransfer,frei0r.sobel,frei0r.threelay0r,frei0r.threshold0r,frei0r.twolay0r,frei0r.vignette,grain,lines,lightgraffiti,oldfilm,threshold,vignette">
<text>Artistic</text>
</group>
......
......@@ -173,8 +173,8 @@ int main(int argc, char *argv[])
#endif
//auto splash = new Splash();
// splash->show();
qApp->processEvents();
//splash->show();
//qApp->processEvents();
qmlRegisterUncreatableMetaObject(PlaylistState::staticMetaObject, // static meta object
"com.enums", // import statement
......@@ -200,12 +200,12 @@ int main(int argc, char *argv[])
QUrl startup = QUrl::fromLocalFile(currentPath.endsWith(QDir::separator()) ? currentPath : currentPath + QDir::separator());
url = startup.resolved(url);
}
qApp->processEvents();
//qApp->processEvents();
Core::build(mltPath);
qApp->processEvents();
//qApp->processEvents();
pCore->initGUI(url);
//splash->endSplash();
qApp->processEvents();
//qApp->processEvents();
int result = app.exec();
Core::clean();
//delete splash;
......
......@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick 2.6
import QtQuick.Controls 1.5
import QtQuick.Window 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Styles 1.4
......@@ -64,7 +64,7 @@ Window {
anchors.top: splashContent.top
anchors.margins: 50
// anchors.horizontalCenter: splashContent.horizontalCenter
source: "../pics/kdenlive-logo.png"
source: "qrc:/pics/kdenlive-logo.png"
fillMode: Image.PreserveAspectFit
height: splashContent.height / 5 - 100
}
......@@ -76,19 +76,19 @@ Window {
spacing: 100
Text {
color: "white"
text: "Website"
text: i18n('Website')
font.bold: true
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
}
Text {
color: "white"
text: "Donate"
text: i18n('Donate')
font.bold: true
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
}
Text {
color: "white"
text: "Forum"
text: i18n('Forum')
font.bold: true
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
}
......@@ -107,7 +107,7 @@ Window {
Text {
id:txtProject
color: "#f38577"
text: "Recent Projects"
text: i18n('Recent Projects')
anchors.top: parent.top
anchors.left: parent.left
anchors.topMargin: 50
......@@ -124,7 +124,7 @@ Window {
anchors.rightMargin: splash.border
height: 3 * splashContent.height / 5
width: splashContent.width
source: "../pics/splash-background.png"
source: "qrc:/pics/splash-background.png"
fillMode: Image.PreserveAspectFit
visible: splashing
}
......@@ -177,7 +177,7 @@ Window {
}
}
label: Text {
text: "Hide on startup"
text: i18n('Hide on startup')
color: "white"
}
}
......@@ -189,14 +189,14 @@ Window {
visible: !splashing
Button {
iconSource:"image://icon/document-new"
text:"New"
text:i18n('New')
//style: CustomButton {
// backColor: splashContent.color
// }
}
Button {
iconSource:"image://icon/document-open"
text:"Open"
text:i18n('Open')
//style: CustomButton {
// backColor: splashContent.color
// }
......
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