Hello community, here is the log from the commit of package kturtle for openSUSE:Factory checked in at 2016-08-31 00:08:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kturtle (Old) and /work/SRC/openSUSE:Factory/.kturtle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kturtle" Changes: -------- --- /work/SRC/openSUSE:Factory/kturtle/kturtle.changes 2016-07-24 19:48:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kturtle.new/kturtle.changes 2016-08-31 00:08:46.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:27:33 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:32:01 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kturtle-16.04.3.tar.xz New: ---- kturtle-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kturtle.spec ++++++ --- /var/tmp/diff_new_pack.oUhrJx/_old 2016-08-31 00:08:47.000000000 +0200 +++ /var/tmp/diff_new_pack.oUhrJx/_new 2016-08-31 00:08:47.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Amusements/Teaching/Mathematics Url: http://edu.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRequires: update-desktop-files ++++++ kturtle-16.04.3.tar.xz -> kturtle-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/CMakeLists.txt new/kturtle-16.08.0/CMakeLists.txt --- old/kturtle-16.04.3/CMakeLists.txt 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/CMakeLists.txt 2016-06-25 18:02:43.000000000 +0200 @@ -33,12 +33,9 @@ CoreAddons ) -include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/interpreter -) - #Allows QString concatenation to use a single memory allocation per source line. add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_subdirectory (doc) add_subdirectory (src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/doc/index.docbook new/kturtle-16.08.0/doc/index.docbook --- old/kturtle-16.04.3/doc/index.docbook 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/doc/index.docbook 2016-06-25 18:02:43.000000000 +0200 @@ -2,7 +2,6 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&kturtle;"> - <!ENTITY package "kdeedu"> <!ENTITY turtlescript "TurtleScript"> <!ENTITY logo "Logo"> <!ENTITY % addindex "INCLUDE"> @@ -62,8 +61,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-02-08</date> -<releaseinfo>0.8.1 beta (&kde; 4.10)</releaseinfo> +<date>2016-05-07</date> +<releaseinfo>0.8.1 beta (Applications 16.04)</releaseinfo> <abstract> <para>&kturtle; is an educational programming environment that aims to make learning how to program as easy as possible. To achieve this &kturtle; makes all programming tools available from the user interface. The programming language used is &turtlescript; which allows its commands to be translated.</para> @@ -165,27 +164,6 @@ </chapter> - - -<appendix id="installation"> -<title>Installation</title> - -<sect1 id="getting-kturtle"> -<title>How to obtain &kturtle;</title> - -&install.intro.documentation; - -</sect1> - -<sect1 id="compilation"> -<title>Compilation and Installation</title> - -&install.compile.documentation; - -</sect1> - -</appendix> - <!--&documentation.index; --> <index id='command-index'> <title>Command Index</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/doc/programming-reference.docbook new/kturtle-16.08.0/doc/programming-reference.docbook --- old/kturtle-16.04.3/doc/programming-reference.docbook 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/doc/programming-reference.docbook 2016-06-25 18:02:43.000000000 +0200 @@ -61,7 +61,7 @@ <sect2 id="boolean-value"> <title>Boolean (true/false) values</title> -<para>There are only two boolean values: <userinput>true</userinput> and <userinput>false</userinput>. Sometimes they are also called: on and off, yes and no, one and zero. But in &turtlescript; we call them, always, <userinput>true</userinput> and <userinput>false</userinput>. Have a look at this piece of &turtlescript;: +<para>There are only two boolean values: <userinput>true</userinput><indexterm><primary>true</primary></indexterm> and <userinput>false</userinput><indexterm><primary>false</primary></indexterm>. Sometimes they are also called: on and off, yes and no, one and zero. But in &turtlescript; we call them, always, <userinput>true</userinput> and <userinput>false</userinput>. Have a look at this piece of &turtlescript;: <screen> $a = true </screen> @@ -111,7 +111,7 @@ <sect2 id="boolean-operators"> <title>Boolean (true/false) operators</title> -<para>Where <link linkend="mathematical-operators">mathematical operators</link> are mainly for <link linkend="number">numbers</link>, boolean operators are for <link linkend="boolean-value">boolean values</link> (<userinput>true</userinput> and <userinput>false</userinput>). There are only three boolean operators, namely: <userinput>and</userinput>, <userinput>or</userinput>, and <userinput>not</userinput>. The following piece of &turtlescript; shows how to use them: +<para>Where <link linkend="mathematical-operators">mathematical operators</link> are mainly for <link linkend="number">numbers</link>, boolean operators are for <link linkend="boolean-value">boolean values</link> (<userinput>true</userinput> and <userinput>false</userinput>). There are only three boolean operators, namely: <userinput>and</userinput><indexterm><primary>and</primary></indexterm>, <userinput>or</userinput><indexterm><primary>or</primary></indexterm>, and <userinput>not</userinput><indexterm><primary>not</primary></indexterm>. The following piece of &turtlescript; shows how to use them: <screen> $and_1_1 = true and true # -> true $and_1_0 = true and false # -> false @@ -745,7 +745,7 @@ <title>The "for" loop, a counting loop</title> <variablelist> <varlistentry> - <term>for<indexterm><primary>for</primary></indexterm><indexterm><primary>step</primary></indexterm></term> + <term>for<indexterm><primary>for</primary></indexterm><indexterm><primary>to</primary></indexterm><indexterm><primary>step</primary></indexterm></term> <listitem><para><screen>for <link linkend="assignment-of-variables">variable</link> = <link linkend="number">number</link> to <link linkend="number">number</link> { ... }</screen> The <userinput>for</userinput> loop is a <quote>counting loop</quote>, &ie; it keeps count for you. The first number sets the variable to the value in the first loop. Every loop the number is increased until the second number is reached. <screen> @@ -805,45 +805,8 @@ <sect1 id="learn"> - -<!--<sect2 id="name"> -<title>Names</title> -<para>When using the &turtlescript; programming language you create new things. If you write a program you will often need <link linkend="containers">containers</link> and in some cases you need <link linkend="learn">learn</link> to create new commands. When making a new command with <link linkend="learn">learn</link> you will have to specify a name.</para> -<para>You can choose any name, as long as it does not already have a meaning. For instance you cannot name a function <link linkend="forward">forward</link>, since that name is already used for an internal command. -<screen> -# here forward is used as a new command, -# but it already has a meaning so -# this will produce an error: -learn forward { - print "this is invalid" -} - -# this works: -learn myforward { - print "this is ok" -} -</screen> -Names can contain only letters, numbers and underscores (_). Yet they have to start with a letter. Container names have to start with the container prefix ($). -<screen> -# here forward is used as a container, -# starting with the $ prefix, so it does -# not conflict with the forward command -$forward = 20 -print $forward -</screen> -</para> -<para>Containers are <glossterm>highlighted</glossterm> with bolded purple in the <link linkend="the-editor">code editor</link>.</para> -<para> -Please read the documentation on <link linkend="containers">containers</link> and the <link linkend="learn">learn</link> command for a better explanation and more examples. -</para> -</sect2>--> - - - - - <title>Create your own commands with <quote>learn</quote></title> -<para><userinput>learn</userinput> is special as it is used to create your own commands. The commands you create can take <glossterm linkend="input-output">input</glossterm> and return <glossterm linkend="input-output">output</glossterm>. Let us take a look at how a new command is created: +<para><userinput>learn</userinput><indexterm><primary>learn</primary></indexterm> is special as it is used to create your own commands. The commands you create can take <glossterm linkend="input-output">input</glossterm> and return <glossterm linkend="input-output">output</glossterm>. Let us take a look at how a new command is created: <screen> learn circle $x { repeat 36 { @@ -868,7 +831,7 @@ circle 40 </screen> </para> -<para>In the next example, a command with a return value is created. +<para>In the next example, a command with a return<indexterm><primary>return</primary></indexterm> value is created. <screen> learn faculty $x { $r = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/doc/using-kturtle.docbook new/kturtle-16.08.0/doc/using-kturtle.docbook --- old/kturtle-16.04.3/doc/using-kturtle.docbook 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/doc/using-kturtle.docbook 2016-06-25 18:02:43.000000000 +0200 @@ -50,7 +50,7 @@ <para>In the menubar you find all the actions of &kturtle;. They are in the following groups: <guimenu>File</guimenu>, <guimenu>Edit</guimenu>, <guimenu>Canvas</guimenu>, <guimenu>Run</guimenu>, <guimenu>Tools</guimenu>, <guimenu>Settings</guimenu>, and <guimenu>Help</guimenu>. This section describes them all.</para> <sect2 id="the-file-menu"> -<title>The <guimenu>File</guimenu> Menu</title> +<title>The File Menu</title> <variablelist> <anchor id="file-new" /> @@ -127,6 +127,9 @@ <anchor id="file-save-as" /> <varlistentry> <term><menuchoice> + <shortcut> + <keycombo>&Ctrl;&Shift;<keycap>S</keycap></keycombo> + </shortcut> <guimenu>File</guimenu> <guimenuitem>Save As...</guimenuitem> </menuchoice></term> @@ -172,7 +175,7 @@ </sect2> <sect2 id="the-edit-menu"> - <title>The <guimenu>Edit</guimenu> Menu</title> + <title>The Edit Menu</title> <variablelist> <anchor id="edit-undo" /> <varlistentry> @@ -320,7 +323,7 @@ <sect2 id="the-canvas-menu"> - <title>The <guimenu>Canvas</guimenu> Menu</title> + <title>The Canvas Menu</title> <variablelist> <anchor id="canvas-export-to-image" /> <varlistentry> @@ -354,7 +357,7 @@ </sect2> <sect2 id="the-run-menu"> - <title>The <guimenu>Run</guimenu> Menu</title> + <title>The Run Menu</title> <variablelist> <anchor id="run-execute" /> <varlistentry> @@ -409,7 +412,7 @@ <sect2 id="the-tools-menu"> - <title>The <guimenu>Tools</guimenu> Menu</title> + <title>The Tools Menu</title> <variablelist> <anchor id="tools-direction-chooser" /> <varlistentry> @@ -433,7 +436,7 @@ </sect2> <sect2 id="the-setting-menu"> - <title>The <guimenu>Settings</guimenu> Menu</title> + <title>The Settings Menu</title> <variablelist> <anchor id="settings-set-script-language" /> <varlistentry> @@ -527,8 +530,10 @@ </sect2> <sect2 id="the-help-menu"> - <title>The <guimenu>Help</guimenu> Menu</title> - &help.menu.documentation; + <title>The Help Menu</title> +<para>&kturtle; has a default &kde; <guimenu>Help</guimenu> menu as described in the +<ulink url="help:/fundamentals/ui.html#menus-help">&kde; Fundamentals</ulink> +with one additional entry:</para> <variablelist> <anchor id="help-context-help" /> <varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/src/CMakeLists.txt new/kturtle-16.08.0/src/CMakeLists.txt --- old/kturtle-16.04.3/src/CMakeLists.txt 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/src/CMakeLists.txt 2016-06-25 18:02:43.000000000 +0200 @@ -1,5 +1,3 @@ -include_directories(${CMAKE_SOURCE_DIR}/kturtle/interpreter) - set(kturtle_SRCS canvas.cpp colorpicker.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/src/editor.cpp new/kturtle-16.08.0/src/editor.cpp --- old/kturtle-16.04.3/src/editor.cpp 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/src/editor.cpp 2016-06-25 18:02:43.000000000 +0200 @@ -28,6 +28,7 @@ #include <QSaveFile> #include <QTemporaryFile> #include <QTextStream> +#include <QBuffer> #include <KFind> #include <KLocalizedString> @@ -125,7 +126,7 @@ if (newFile()) { setContent(example); editor->document()->setModified(false); - setCurrentUrl(exampleName); + setCurrentUrl(QUrl::fromLocalFile(exampleName)); } } @@ -160,34 +161,27 @@ url = QFileDialog::getOpenFileUrl(this, i18n("Open"), QUrl(), - QString("%1 (.*turtle);;%2 (*)").arg(i18n("Turtle code files")).arg(i18n("All files")) + QString("%1 (*.turtle);;%2 (*)").arg(i18n("Turtle code files")).arg(i18n("All files")) ); } if (!url.isEmpty()) { -// if (!KIO::NetAccess::exists(url, KIO::NetAccess::SourceSide, this)) { -// KMessageBox::error(this, i18n("The given file could not be read, check if it exists and if it is readable for the current user.")); -// return false; -// } - QString fileString; // could be a tmp file or local file - KIO::StoredTransferJob *job = KIO::storedGet(url); + KIO::StoredTransferJob *job = KIO::storedGet(url); if (job->exec()) { - QFile file(job->url().toLocalFile()); - if (!file.open(QFile::ReadOnly | QFile::Text)) { - KMessageBox::error(this, i18n("Cannot read %1", fileString)); - return false; + QByteArray data = job->data(); + QBuffer buffer(&data); + if (!buffer.open(QIODevice::ReadOnly | QIODevice::Text)) { + return false; // can't happen } - QTextStream in(&file); + QTextStream in(&buffer); // check for our magic identifier QString s; s = in.readLine(); if (s != KTURTLE_MAGIC_1_0) { - KMessageBox::error(this, i18n("The file you try to open is not a valid KTurtle script, or is incompatible with this version of KTurtle.\nCannot open %1", fileString)); + KMessageBox::error(this, i18n("The file you try to open is not a valid KTurtle script, or is incompatible with this version of KTurtle.\nCannot open %1", url.toDisplayString(QUrl::PreferLocalFile))); return false; } - QString localizedScript; - localizedScript = Translator::instance()->localizeScript(in.readAll()); + QString localizedScript = Translator::instance()->localizeScript(in.readAll()); setContent(localizedScript); - QFile::remove(fileString); setCurrentUrl(url); editor->document()->setModified(false); emit fileOpened(url); @@ -267,7 +261,7 @@ QUrl url = QFileDialog::getSaveFileUrl(this, i18n("Save As"), QUrl(), - QString("%1 (.*turtle);;%2 (*)").arg(i18n("Turtle code files")).arg(i18n("All files")) + QString("%1 (*.turtle);;%2 (*)").arg(i18n("Turtle code files")).arg(i18n("All files")) ); if (url.isEmpty()) return false; KIO::StatJob *job = KIO::stat(url, KIO::StatJob::SourceSide, 0); @@ -347,7 +341,7 @@ void Editor::setCurrentUrl(const QUrl &url) { - m_currentUrl = QUrl(url); + m_currentUrl = url; emit contentNameChanged(m_currentUrl.fileName()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kturtle-16.04.3/src/mainwindow.cpp new/kturtle-16.08.0/src/mainwindow.cpp --- old/kturtle-16.04.3/src/mainwindow.cpp 2016-03-15 21:41:26.000000000 +0100 +++ new/kturtle-16.08.0/src/mainwindow.cpp 2016-06-25 18:02:43.000000000 +0200 @@ -741,8 +741,6 @@ QAction* action = qobject_cast<QAction*>(sender()); QString exampleFilename = action->data().toString(); editor->openFile(QUrl::fromLocalFile(exampleFilename)); - QFileInfo fileInfo(exampleFilename); - editor->setCurrentUrl(fileInfo.baseName()); } void MainWindow::toggleOverwriteMode(bool b)
