[Pkg-octave-commit] [qtoctave] 01/01: Indicate in the splash screen that qtoctave is a deprecated program

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch deprecation
in repository qtoctave.

commit b3f87f9df437c0623d4355be5c699f5f8d5cf56b
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Mon Feb 24 00:31:30 2014 +0100

    Indicate in the splash screen that qtoctave is a deprecated program
    
    This is accomplished by patching file qtoctave/src/main.cpp, using the
    newly introduced patch deprecation-splash-screen.  Also, since the
    message text is four lines long, a new, taller splash image is
    introduced (debian/splash-taller.png) and installed into the appropriate
    directory using debian/qtoctave.install.
---
 debian/patches/deprecation-splash-screen |  76 +++++++++++++++++++++++++++++++
 debian/patches/series                    |   1 +
 debian/qtoctave.install                  |   1 +
 debian/source/include-binaries           |   1 +
 debian/splash-taller.png                 | Bin 0 -> 156056 bytes
 5 files changed, 79 insertions(+)

diff --git a/debian/patches/deprecation-splash-screen b/debian/patches/deprecation-splash-screen
new file mode 100644
index 0000000..2e7aa39
--- /dev/null
+++ b/debian/patches/deprecation-splash-screen
@@ -0,0 +1,76 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ qtoctave (0.10.1-3) unstable; urgency=low
+ .
+   * Depend on octave 3.6
+   * Recommend octave-info, since by default qtoctave uses Info and not HTML
+   * Bump to debhelper compat level 9
+   * Bump to Standards-Version 3.9.3, no changes needed
+   * debian/patches/use_octave_htmldoc: update patch
+   * debian/patches/qtinfo-octave3.4: new patch from upstream SVN
+   * debian/patches/initial_position: new patch imported from Fedora
+   * debian/patches/no-native-menubars: new patch imported from Ubuntu
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- qtoctave-0.10.1.orig/qtoctave/src/main.cpp
++++ qtoctave-0.10.1/qtoctave/src/main.cpp
+@@ -35,7 +35,16 @@
+ #include "mainwindow.h"
+ #include "editor.h"
+ #include "svgcanvas/svgcanvas.h"
++#include <unistd.h>
++#include <QThread>
+ 
++class I : public QThread
++{
++public:
++    static void sleep(unsigned long secs) {
++        QThread::sleep(secs);
++    }
++};
+ 
+ 
+ Main::Main(QObject * parent ):QObject (parent)
+@@ -739,8 +748,8 @@ int main(int argn, char *argv[])
+ 	//Se inicializa la configuración
+ 	get_config("");
+ 	//Show splash screen
+-	QSplashScreen *splash = new QSplashScreen( QPixmap(QString(ICON_PATH) +QDir::separator()+ "splash.png")/*,  Qt::WindowStaysOnTopHint*/ );
+-	splash->showMessage ("Starting QtOctave",Qt::AlignBottom|Qt::AlignLeft);
++	QSplashScreen *splash = new QSplashScreen( QPixmap(QString(ICON_PATH) +QDir::separator()+ "splash-taller.png")/*,  Qt::WindowStaysOnTopHint*/ );
++	splash->showMessage ("QtOctave is deprecated in Debian.\nIt will be removed as soon as\nthe Octave's GUI becomes the\ndefault interface.",Qt::AlignBottom|Qt::AlignLeft,Qt::red);
+ 	splash->show();
+ 
+ 	// Translations
+@@ -792,7 +801,13 @@ int main(int argn, char *argv[])
+ 	m.openFilesToEdit(command_line_find_files(argn,argv));
+ 	
+ 	//Destroy splash screnn
++	m.mainWindowWidget()->hide();
++	splash->hide();
++	splash->show();
++	a.processEvents();
++	I::sleep (5);
+ 	splash->finish(m.mainWindowWidget());
+ 	delete splash;
++	m.mainWindowWidget()->showMaximized();
+ 	return a.exec();
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 29f8d02..1f75433 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ filedialog-filters
 qtinfo-octave3.4
 initial_position
 no-native-menubars
+deprecation-splash-screen
diff --git a/debian/qtoctave.install b/debian/qtoctave.install
index 977fde2..07ff7ee 100644
--- a/debian/qtoctave.install
+++ b/debian/qtoctave.install
@@ -1 +1,2 @@
 debian/qtoctave.desktop usr/share/applications
+debian/splash-taller.png usr/share/qtoctave/images
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 0d98337..02e0f78 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1,2 @@
 debian/icons.tar
+debian/splash-taller.png
diff --git a/debian/splash-taller.png b/debian/splash-taller.png
new file mode 100644
index 0000000..1d03132
Binary files /dev/null and b/debian/splash-taller.png differ

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/qtoctave.git