Skip to content
Snippets Groups Projects
Commit 35ffe2db authored by jpbl's avatar jpbl
Browse files

SFLPhoned is back

parent e57d3037
No related branches found
No related tags found
No related merge requests found
SUBDIRS = include libs src ringtones skins
EXTRA_DIST = tools/*.sh tools/install-sip* debian/* README.cvs CHANGES
SUBDIRS = include libs src ringtones skins m4
EXTRA_DIST = tools/*.sh debian/* README.cvs CHANGES images/*
ACLOCAL_FLAGS=-I$(top_srcdir)/m4
......@@ -37,7 +37,7 @@ AC_SUBST(LIBQT)
AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
AM_INIT_AUTOMAKE(sflphoned, $VERSION)
AM_INIT_AUTOMAKE(sflphone, $VERSION)
AC_PROG_LIBTOOL
dnl check for portaudio
......@@ -165,7 +165,6 @@ AC_SUBST(sflphone_datadir)
AC_SUBST(LIB_DNSSD)
AM_CONDITIONAL(USE_ZEROCONF, test "$have_libdns_sd" = "yes")
LIBS="$LIBS -lstdc++"
AC_SUBST(LIB_QT)
......
......@@ -25,6 +25,7 @@
#include "WidgetBuilder.hpp"
#include "WidgetBuilderFactory.hpp"
#include "config.h"
#include "qtutils.hpp"
#define DEFAULT_DIRECTORY "skins/"
......@@ -37,15 +38,21 @@
taxidermy::Hunter::Hunter()
: mSkinsDirectory(DEFAULT_DIRECTORY)
{}
{
qtutils::addFilePath(mSkinsDirectory.absPath());
}
taxidermy::Hunter::Hunter(const QString &directory)
: mSkinsDirectory(directory)
{}
{
qtutils::addFilePath(mSkinsDirectory.absPath());
}
taxidermy::Hunter::Hunter(const QDir &directory)
: mSkinsDirectory(directory)
{}
{
qtutils::addFilePath(mSkinsDirectory.absPath());
}
QStringList
taxidermy::Hunter::getSkinNames()
......@@ -72,6 +79,7 @@ taxidermy::Taxidermist
taxidermy::Hunter::getTaxidermist(const QString &skinName)
{
taxidermy::Taxidermist skin(skinName);
qtutils::addFilePath(mSkinsDirectory.absFilePath(skinName));
load(&skin);
return skin;
......
......@@ -22,6 +22,15 @@
#include <qbitmap.h>
#include <qimage.h>
#include <qmime.h>
void
taxidermy::qtutils::addFilePath(const QString &path)
{
QMimeSourceFactory *factory = QMimeSourceFactory::defaultFactory();
factory->addFilePath(path);
}
QPixmap
taxidermy::qtutils::transparize(const QString &image)
......@@ -37,7 +46,6 @@ taxidermy::qtutils::transparize(const QString &image)
}
}
#else
// QPixmap p(QPixmap::fromMimeSource(image));
QImage img(QImage::fromMimeSource(image));
QPixmap p;
p.convertFromImage(img);
......
......@@ -25,5 +25,7 @@ namespace taxidermy
namespace qtutils
{
QPixmap transparize(const QString &image);
void addFilePath(const QString &path);
};
};
......@@ -39,8 +39,8 @@ typedef short int16;
#define _debugInit(...)
#endif
#define SFLPHONED_VERSION "0.6.1"
#define SFLPHONED_VERSIONNUM 0x000605
#define SFLPHONED_VERSION "0.6.3"
#define SFLPHONED_VERSIONNUM 0x000603
#define PROGNAME "sflphoned"
#define PROGNAME_GLOBAL "sflphone"
......
......@@ -1108,7 +1108,7 @@ Laurielle LEA &lt;br/&gt; &amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;laurielle.lea@sa
Yan Morin &lt;br/&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;yan.morin@savoirfairelinux.com&amp;gt;&lt;br /&gt;
Jérome Oufella &lt;br/&gt; &amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;lt;jerome.oufella@savoirfairelinux.com&amp;gt;&lt;br /&gt;
&lt;br /&gt;SFLphone-qt 0.6.2 is released under the General Public License. For more information, see http://www.sflphone.org&lt;/p&gt;</string>
&lt;br /&gt;SFLPhone 0.6.3 is released under the General Public License. For more information, see http://www.sflphone.org&lt;/p&gt;</string>
</property>
</widget>
<widget class="QLabel" row="0" column="1">
......
......@@ -238,7 +238,7 @@ void
SFLPhoneApp::loadSkin()
{
SkinManager::instance().setApplication(this);
SkinManager::instance().load("metal");
SkinManager::instance().load();
}
void
......
......@@ -24,9 +24,10 @@
SkinManagerImpl::SkinManagerImpl()
: mApp(NULL)
, mHunter(DATADIR)
, mHunter(SKINDIR)
{
mSettings.setPath("savoirfairelinux.com", PROGNAME);
mSettings.beginGroup("/" PROGNAME);
mPaths = mSettings.readListEntry("SkinPaths");
}
......@@ -39,7 +40,11 @@ SkinManagerImpl::setApplication(QApplication *app)
void
SkinManagerImpl::load()
{
load(mSettings.readEntry("Skin", "metal"));
bool ok;
load(mSettings.readEntry("Skin", "metal", &ok));
if(!ok) {
mSettings.writeEntry("Skin", "metal");
}
}
void
......
......@@ -52,4 +52,6 @@
#define PREFERENCES_SECTION "Preferences"
#define PREFERENCES_THEME "Themes.skinChoice"
#define SKINDIR DATADIR "/skins"
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment