[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-edu-devel
Subject: Re: Pairs going to KDE Edu
From: Andrius da Costa Ribas <andriusmao () gmail ! com>
Date: 2012-04-19 14:45:20
Message-ID: CADzOArHj7viBEqmaqfBCioOrbUf0sv=QGj=3-T7-CAkr5Vx=Hg () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Hello,
Please find attached suggested patches to fix/improve Windows build.
(ps: I'm not in kde-edu mailing list, so this e-mail will probably be
blocked there).
Thanks,
Andrius.
2012/4/17 Albert Astals Cid <aacid@kde.org>
> El Dilluns, 16 d'abril de 2012, a les 03:35:51, Aleix Pol va escriure:
> > Hi,
> > Last friday Pairs [1] was moved from playground/edu to kdereview
> > because we want it to be moved to kdeedu. We have been working on it
> > for a while already and we would like it to move to kde edu and to be
> > included in the next KDE release.
> >
> > If someone is interested, please take a look into it and tell us what you
> > think.
>
> More problems:
> * The repo is marked as inactive in projects.kde.org, so scripty doesn't
> run
> over it
> * The desktop file has X-DocPath but you removed the doc
> * The desktop file has X-Ubuntu-Gettext-Domain=desktop_kdesdk
>
> Albert
>
> >
> > Thanks!
> > Aleix
> >
> > PS: It has a notable artwork lacking that's being worked on, slowly.
> > Although if anybody is interested in joining, we are welcoming people
> >
> > :).
> >
> > [1] https://projects.kde.org/projects/kdereview/pairs
>
[Attachment #5 (text/html)]
<div>Hello,</div><div><br></div>Please find attached suggested patches to fix/improve \
Windows build.<div><br></div><div>(ps: I'm not in kde-edu mailing list, so this \
e-mail will probably be blocked there).</div><div><br>
</div><div>Thanks,</div><div>Andrius.<br><br><div class="gmail_quote">2012/4/17 \
Albert Astals Cid <span dir="ltr"><<a \
href="mailto:aacid@kde.org">aacid@kde.org</a>></span><br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">
<div class="im">El Dilluns, 16 d'abril de 2012, a les 03:35:51, Aleix Pol va \
escriure:<br> </div><div class="im">> Hi,<br>
> Last friday Pairs [1] was moved from playground/edu to kdereview<br>
> because we want it to be moved to kdeedu. We have been working on it<br>
> for a while already and we would like it to move to kde edu and to be<br>
> included in the next KDE release.<br>
><br>
> If someone is interested, please take a look into it and tell us what you<br>
> think.<br>
<br>
</div>More problems:<br>
* The repo is marked as inactive in <a href="http://projects.kde.org" \
target="_blank">projects.kde.org</a>, so scripty doesn't run<br> over it<br>
* The desktop file has X-DocPath but you removed the doc<br>
* The desktop file has X-Ubuntu-Gettext-Domain=desktop_kdesdk<br>
<span class="HOEnZb"><font color="#888888"><br>
Albert<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
><br>
> Thanks!<br>
> Aleix<br>
><br>
> PS: It has a notable artwork lacking that's being worked on, slowly.<br>
> Although if anybody is interested in joining, we are welcoming people<br>
><br>
> :).<br>
><br>
> [1] <a href="https://projects.kde.org/projects/kdereview/pairs" \
target="_blank">https://projects.kde.org/projects/kdereview/pairs</a><br> \
</div></div></blockquote></div><br></div>
--047d7b33900bf62f6904be0939cb--
["0003-Fix-usage-of-local-file-URLs.patch" (application/octet-stream)]
From 9d0058ecac06c724e72627bec4f32bfa2919abc1 Mon Sep 17 00:00:00 2001
From: Andrius da Costa Ribas <andriusmao@gmail.com>
Date: Thu, 19 Apr 2012 11:20:30 -0300
Subject: [PATCH 3/4] Fix usage of local file URLs.
---
src/playersmodel.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/playersmodel.cpp b/src/playersmodel.cpp
index 0083791..66ff073 100644
--- a/src/playersmodel.cpp
+++ b/src/playersmodel.cpp
@@ -43,7 +43,7 @@ PlayersModel::PlayersModel(QObject* parent)
setRoleNames(names);
m_playerIcons = KGlobal::dirs()->findAllResources("appdata", QLatin1String( "players/*.png"));
for(QStringList::iterator it=m_playerIcons.begin(), itEnd=m_playerIcons.end(); it!=itEnd; ++it) {
- *it = "file://"+*it;
+ *it = QUrl::fromLocalFile(*it).toString();
}
QMetaObject::invokeMethod(this, "refresh", Qt::QueuedConnection);
@@ -135,5 +135,5 @@ void PlayersModel::removePlayer(int p)
QString PlayersModel::iconsDir(const QString& path)
{
- return "file://"+KGlobal::dirs()->findResource("appdata", path);
+ return QUrl::fromLocalFile(KGlobal::dirs()->findResource("appdata", path)).toString();
}
--
1.7.4.msysgit.0.173.g83185.dirty
["0004-Add-Windows-Mac-application-icon.patch" (application/octet-stream)]
From 8f04bea64cfdfc36798ea52ce70196c0724ed94b Mon Sep 17 00:00:00 2001
From: Andrius da Costa Ribas <andriusmao@gmail.com>
Date: Thu, 19 Apr 2012 11:36:17 -0300
Subject: [PATCH 4/4] Add Windows/Mac application icon.
---
src/CMakeLists.txt | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index da5a9e7..38aceeb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,6 +33,8 @@ set(pairs_SRCS pairstheme.cpp carditem.cpp
qt4_add_resources(pairs_SRCS resources.qrc)
+kde4_add_app_icon(pairs_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-pairs.png")
+
kde4_add_executable(pairs ${pairs_SRCS})
target_link_libraries(pairs ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS}
--
1.7.4.msysgit.0.173.g83185.dirty
["0001-Fix-usage-of-local-file-URLs-Whitespace-fixes.patch" (application/octet-stream)]
From 18f75dcc1df0bb5bf0b7901546ac6cf7815aad18 Mon Sep 17 00:00:00 2001
From: Andrius da Costa Ribas <andriusmao@gmail.com>
Date: Thu, 19 Apr 2012 11:16:19 -0300
Subject: [PATCH 1/4] Fix usage of local file URLs, Whitespace fixes.
---
src/pairstheme.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pairstheme.cpp b/src/pairstheme.cpp
index 4eaf013..dbe2868 100644
--- a/src/pairstheme.cpp
+++ b/src/pairstheme.cpp
@@ -46,9 +46,9 @@ PairsTheme::PairsTheme(const QString& path)
: QStandardItem()
, m_archive(path)
{
- bool b = m_archive.open(QIODevice::ReadOnly);
+ bool b = m_archive.open(QIODevice::ReadOnly);
Q_ASSERT(b);
- QStringList files(m_archive.directory()->entries());
+ QStringList files(m_archive.directory()->entries());
files = files.filter(QRegExp("*.game", Qt::CaseSensitive, QRegExp::Wildcard));
Q_ASSERT(files.count()==1 && "no games in the theme!");
@@ -219,7 +219,7 @@ void PairsTheme::parseElement(QXmlStreamReader &reader)
bool PairsTheme::isValid(const KArchiveFile* file) {
- QUrl schemaUrl(KGlobal::dirs()->findResource("appdata", QLatin1String( \
"themes/game.xsd" ))); + QUrl schemaUrl = \
QUrl::fromLocalFile(KGlobal::dirs()->findResource("appdata", QLatin1String( \
"themes/game.xsd" ))); QXmlSchema schema;
schema.load(schemaUrl);
--
1.7.4.msysgit.0.173.g83185.dirty
["0002-Files-provided-by-Pairs-are-Zip-files.-Changing-from.patch" (application/octet-stream)]
From 3a82757779cc5e15b50f83116d67014b199fa97c Mon Sep 17 00:00:00 2001
From: Andrius da Costa Ribas <andriusmao@gmail.com>
Date: Thu, 19 Apr 2012 11:17:29 -0300
Subject: [PATCH 2/4] Files provided by Pairs are Zip files. Changing from KTar to KZip
---
src/pairstheme.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pairstheme.h b/src/pairstheme.h
index 1f03f88..29a3d02 100644
--- a/src/pairstheme.h
+++ b/src/pairstheme.h
@@ -27,7 +27,7 @@
#include <QVariant>
#include <QList>
#include <QSet>
-#include <KTar>
+#include <KZip>
#include <QXmlStreamReader>
#include <QStandardItem>
#include "cardtype.h"
@@ -99,7 +99,7 @@ class PairsTheme : public QObject, public QStandardItem
QString m_error;
QSet<QString> m_languages;
QMap<QString, QSet<QString> > m_cardtypes;
- KTar m_archive;
+ KZip m_archive;
};
#endif // PAIRSTHEME_H
--
1.7.4.msysgit.0.173.g83185.dirty
_______________________________________________
kde-edu mailing list
kde-edu@mail.kde.org
https://mail.kde.org/mailman/listinfo/kde-edu
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic