QtComponents/Butaca - Revision history

inean: /* Adapt Packing files */

inean — Tue, 13 Sep 2011 19:33:05 GMT

Adapt Packing files

← Older revision		Revision as of 19:33, 13 September 2011
Line 324:		Line 324:
	- libqtwebkit-dev		- libqtwebkit-dev
	+Build-Depends: debhelper (>= 5), cdbs,		+Build-Depends: debhelper (>= 5), cdbs,
-	+ libqt4-dev, libqt4-webkit-dev	+	+ libqt4-dev, libqt4-webkit-dev, quilt
	Standards-Version: 3.8.4		Standards-Version: 3.8.4
	XB-Maemo-Flags: visible		XB-Maemo-Flags: visible

inean: /* Applauncherd */

inean — Tue, 13 Sep 2011 19:24:54 GMT

Applauncherd

← Older revision		Revision as of 19:24, 13 September 2011
Line 29:		Line 29:
	- QApplication *app = MDeclarativeCache::qApplication(argc, argv);		- QApplication *app = MDeclarativeCache::qApplication(argc, argv);
	- QDeclarativeView *view = MDeclarativeCache::qDeclarativeView();		- QDeclarativeView *view = MDeclarativeCache::qDeclarativeView();
-	+ QApplication app ~~= QApplication~~(argc, argv);	+	+ QApplication app(argc, argv);
-	+ QDeclarativeView view ~~= QDeclarativeView()~~;	+	+ QDeclarativeView view;

	- QDeclarativeContext *context = view->rootContext();		- QDeclarativeContext *context = view->rootContext();
Line 41:		Line 41:
	+ view.showFullScreen();		+ view.showFullScreen();

-	int result = app->exec();	+	- int result = app->exec();
		+	+ int result = app.exec();

	delete controller;		delete controller;

inean: /* Adapt Packing files */

inean — Tue, 13 Sep 2011 18:51:55 GMT

Adapt Packing files

← Older revision		Revision as of 18:51, 13 September 2011
Line 323:		Line 323:
	- libqtwebkit-dev		- libqtwebkit-dev
	+Build-Depends: debhelper (>= 5), cdbs,		+Build-Depends: debhelper (>= 5), cdbs,
-	+ libqt4-dev, ~~libqtwebkit~~-dev	+	+ libqt4-dev, libqt4-webkit-dev
	Standards-Version: 3.8.4		Standards-Version: 3.8.4
	XB-Maemo-Flags: visible		XB-Maemo-Flags: visible

inean: /* Update packing scripts */

inean — Tue, 13 Sep 2011 18:41:24 GMT

Update packing scripts

← Older revision		Revision as of 18:41, 13 September 2011
Line 296:		Line 296:
	and copy generated files into debian/patches directory.		and copy generated files into debian/patches directory.

-	Finally, modify rules file at debian directory to merge patches. At ~~'''config-stamp''' rule~~ add:	+	Finally, modify rules file at debian directory to merge patches. At cdbs rules definition add:
	<syntaxhighlight lang="make">include /usr/share/cdbs/1/rules/simple-patchsys.mk		<syntaxhighlight lang="make">include /usr/share/cdbs/1/rules/simple-patchsys.mk
	</syntaxhighlight>		</syntaxhighlight>

inean: /* Update packing scripts */

inean — Tue, 13 Sep 2011 18:40:48 GMT

Update packing scripts

← Older revision		Revision as of 18:40, 13 September 2011
Line 297:		Line 297:

	Finally, modify rules file at debian directory to merge patches. At '''config-stamp''' rule add:		Finally, modify rules file at debian directory to merge patches. At '''config-stamp''' rule add:
-	<syntaxhighlight lang="make">~~for p in debian~~/~~patches~~/*; do patch -~~p1 < $$p; done~~	+	<syntaxhighlight lang="make">include /usr/share/cdbs/1/rules/simple-patchsys.mk
	</syntaxhighlight>		</syntaxhighlight>

inean: /* Update packing scripts */

inean — Tue, 13 Sep 2011 18:31:50 GMT

Update packing scripts

← Older revision		Revision as of 18:31, 13 September 2011
Line 298:		Line 298:
	Finally, modify rules file at debian directory to merge patches. At '''config-stamp''' rule add:		Finally, modify rules file at debian directory to merge patches. At '''config-stamp''' rule add:
	<syntaxhighlight lang="make">for p in debian/patches/*; do patch -p1 < $$p; done		<syntaxhighlight lang="make">for p in debian/patches/*; do patch -p1 < $$p; done
		+	</syntaxhighlight>
		+
		+	==== Adapt Packing files ====
		+	Set debhelper from 7 to 5 and remove unused deps
		+
		+	<syntaxhighlight lang="diff">
		+	diff --git a/debian/compat b/debian/compat
		+	index 7f8f011..7ed6ff8 100644
		+	--- a/debian/compat
		+	+++ b/debian/compat
		+	@@ -1 +1 @@
		+	-7
		+	+5
		+	diff --git a/debian/control b/debian/control
		+	index 374197b..d1711dd 100644
		+	--- a/debian/control
		+	+++ b/debian/control
		+	@@ -2,9 +2,8 @@ Source: butaca
		+	Section: user/network
		+	Priority: extra
		+	Maintainer: Simon Pena <spena@igalia.com>
		+	-Build-Depends: debhelper (>= 7), applauncherd-dev, cdbs,
		+	- libqt4-dev, maemo-meegotouch-interfaces-dev, libmdatauri-dev,
		+	- libqtwebkit-dev
		+	+Build-Depends: debhelper (>= 5), cdbs,
		+	+ libqt4-dev, libqtwebkit-dev
		+	Standards-Version: 3.8.4
		+	XB-Maemo-Flags: visible
		+	XB-Homepage: https://projects.developer.nokia.com/butaca/
	</syntaxhighlight>		</syntaxhighlight>

	And thats all. You have '''Butaca''' working on Maemo5		And thats all. You have '''Butaca''' working on Maemo5

inean: /* Adapt deployment to Fremantle */

inean — Tue, 13 Sep 2011 18:31:30 GMT

Adapt deployment to Fremantle

← Older revision		Revision as of 18:31, 13 September 2011
Line 287:		Line 287:

	INSTALLS += butacascript desktop icon splash		INSTALLS += butacascript desktop icon splash
-	~~</syntaxhighlight>~~
-
-	~~==== Adapt Packing files ====~~
-	~~Set debhelper from 7 to 5 and remove unused deps~~
-
-	~~<syntaxhighlight lang="diff">~~
-	~~diff --git a/debian/compat b/debian/compat~~
-	~~index 7f8f011..7ed6ff8 100644~~
-	~~--- a/debian/compat~~
-	~~+++ b/debian/compat~~
-	~~@@ -1 +1 @@~~
-	-7
-	+5
-	~~diff --git a/debian/control b/debian/control~~
-	~~index 374197b..d1711dd 100644~~
-	~~--- a/debian/control~~
-	~~+++ b/debian/control~~
-	~~@@ -2,9 +2,8 @@ Source: butaca~~
-	~~Section: user/network~~
-	~~Priority: extra~~
-	~~Maintainer: Simon Pena <spena@igalia.com>~~
-	~~-Build-Depends: debhelper (>= 7), applauncherd-dev, cdbs,~~
-	~~- libqt4-dev, maemo-meegotouch-interfaces-dev, libmdatauri-dev,~~
-	~~- libqtwebkit-dev~~
-	~~+Build-Depends: debhelper (>= 5), cdbs,~~
-	~~+ libqt4-dev, libqtwebkit-dev~~
-	~~Standards-Version: 3.8.4~~
-	~~XB-Maemo-Flags: visible~~
-	~~XB-Homepage: https://projects.developer.nokia.com/butaca/~~
	</syntaxhighlight>		</syntaxhighlight>

inean: /* Adapt deployment to Fremantle */

inean — Tue, 13 Sep 2011 18:30:56 GMT

Adapt deployment to Fremantle

← Older revision		Revision as of 18:30, 13 September 2011
Line 244:		Line 244:
	Some changes on how '''Butaca''' is deployed are needed to match Fremantle requirements.		Some changes on how '''Butaca''' is deployed are needed to match Fremantle requirements.

-	=== ~~Optify code~~ ===	+	=== Deployment ===
		+	Add minimal changes to fit fremantle

-	=== ~~Update Desktop file~~ ===	+	==== Optify ====
-	~~And finally, update~~ desktop ~~file~~. ~~There's no applauncerd on fremantle~~, ~~so remove invoker from~~ Exec. ~~With this action we loose~~ splash-~~screen~~.	+	Point binary to /opt and adapt paths to Fremantle
		+
		+	<syntaxhighlight lang="diff">
		+	diff --git a/butaca.desktop b/butaca.desktop
		+	index d0af6f4..6b552de 100644
		+	--- a/butaca.desktop
		+	+++ b/butaca.desktop
		+	@@ -3,6 +3,6 @@ Encoding=UTF-8
		+	Version=1.0
		+	Type=Application
		+	Name=Butaca
		+	-Exec=/usr/bin/butaca
		+	-Icon=/usr/share/icons/hicolor/64x64/apps/butaca.png
		+	+Exec=/opt/bin/butaca
		+	+Icon=butaca
		+	Categories=Network;
		+	diff --git a/butaca.pro b/butaca.pro
		+	index 268b85a..a7b1fa8 100644
		+	--- a/butaca.pro
		+	+++ b/butaca.pro
		+	@@ -61,15 +61,15 @@ CONFIG += shareuiinterface-maemo-meegotouch \
		+	}
		+
		+	butacascript.files = butaca
		+	-butacascript.path = /usr/bin/
		+	+butacascript.path = /opt/bin/
		+
		+	desktop.files = butaca.desktop
		+	-desktop.path = /usr/share/applications/
		+	+desktop.path = /usr/share/applications/hildon/
		+
		+	icon.files = butaca.png
		+	icon.path = /usr/share/icons/hicolor/64x64/apps/
		+
		+	splash.files = butaca-splash.jpg
		+	-splash.path = /usr/share/butaca/
		+	+splash.path = /opt/share/butaca/
		+
		+	INSTALLS += butacascript desktop icon splash
		+	</syntaxhighlight>
		+
		+	==== Adapt Packing files ====
		+	Set debhelper from 7 to 5 and remove unused deps
		+
		+	<syntaxhighlight lang="diff">
		+	diff --git a/debian/compat b/debian/compat
		+	index 7f8f011..7ed6ff8 100644
		+	--- a/debian/compat
		+	+++ b/debian/compat
		+	@@ -1 +1 @@
		+	-7
		+	+5
		+	diff --git a/debian/control b/debian/control
		+	index 374197b..d1711dd 100644
		+	--- a/debian/control
		+	+++ b/debian/control
		+	@@ -2,9 +2,8 @@ Source: butaca
		+	Section: user/network
		+	Priority: extra
		+	Maintainer: Simon Pena <spena@igalia.com>
		+	-Build-Depends: debhelper (>= 7), applauncherd-dev, cdbs,
		+	- libqt4-dev, maemo-meegotouch-interfaces-dev, libmdatauri-dev,
		+	- libqtwebkit-dev
		+	+Build-Depends: debhelper (>= 5), cdbs,
		+	+ libqt4-dev, libqtwebkit-dev
		+	Standards-Version: 3.8.4
		+	XB-Maemo-Flags: visible
		+	XB-Homepage: https://projects.developer.nokia.com/butaca/
		+	</syntaxhighlight>

	commit		commit

inean: /* Handle Close events */

inean — Tue, 13 Sep 2011 18:20:45 GMT

Handle Close events

← Older revision		Revision as of 18:20, 13 September 2011
Line 225:		Line 225:

	<syntaxhighlight lang="diff">		<syntaxhighlight lang="diff">
		+	diff --git a/src/main.cpp b/src/main.cpp
		+	index 8f1c989..2fef2c3 100644
		+	--- a/src/main.cpp
		+	+++ b/src/main.cpp
		+	@@ -32,6 +32,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
		+	ButacaController *controller = new ButacaController(context);
		+
		+	view.setSource(QUrl("qrc:/qml/main.qml"));
		+	+ QObject::connect((QObject*)view.engine(), SIGNAL(quit()), &app, SLOT(quit()));
		+	view.showFullScreen();
		+
		+	int result = app->exec();
	</syntaxhighlight>		</syntaxhighlight>

inean: /* Refactor QML files */

inean — Tue, 13 Sep 2011 18:08:29 GMT

Refactor QML files

← Older revision		Revision as of 18:08, 13 September 2011
Line 181:		Line 181:

	== Refactor QML files ==		== Refactor QML files ==
-	As on [QtComponents/Miniature], we need to replace namespace by the fremantle one. In this case we need to go a bit further ~~use [[migrateTo]] for this task~~.	+	As on [QtComponents/Miniature], we need to replace namespace by the fremantle one. In this case we need to go a bit further.

-	=== Update ~~hardcoded paths~~ ===	+	=== Update namespace ===
		+	Use [QtComponents/migrateTo], sed or an app like regexxer. See [QtComponents/Miniature] for required changes
		+
		+	==== Hardcoded Paths ====
		+	Butaca fetch Properties directly from UIConstants.js js library. This library is private to QtComponents, so it uses a file://point/to/uiConstants.js schemas that we should also change.
		+
		+	See [[QtComponents/ThemeHowto]] for a better (and non upstream portable) way of doing this.

	=== Remove QtQuick 1.1 code ===		=== Remove QtQuick 1.1 code ===
		+	Reached this point. Project should be runnable on QtSimulator. '''Use QtSimulator 1.1'''. If we get console.log errors, it would be produced by unsupported QtQuick 1.1 code.

-	~~commit~~.	+	<syntaxhighlight lang="bash">
		+	PATH/TO/QTSIMULATOR 1.1/Qt/gcc/bin/qmake butaca.pro && make && ./butaca
		+	</syntaxhighlight>

		+	See [[QtComponents/QtSimulator]] for hints about how to get QtComponents running on it
		+
		+	After a trial and error process we get:
		+	<syntaxhighlight lang="diff">
		+	diff --git a/qml/MultipleMoviesDelegate.qml b/qml/MultipleMoviesDelegate.qml
		+	index 03b5a05..df468de 100644
		+	--- a/qml/MultipleMoviesDelegate.qml
		+	+++ b/qml/MultipleMoviesDelegate.qml
		+	@@ -107,7 +107,9 @@ Item {
		+	font.weight: movieDelegate.titleWeight
		+	font.pixelSize: movieDelegate.titleSize
		+	color: movieDelegate.titleColor
		+	- maximumLineCount: 3
		+	+ //{QTQUICK1.1
		+	+ //maximumLineCount: 3
		+	+ //}
		+	wrapMode: Text.WordWrap
		+	text: title
		+	}
		+	</syntaxhighlight>
		+
		+	commit.

	== Handle Close events ==		== Handle Close events ==