[meego-commits] 7045: Changes to Trunk:IVI/ivihome
Jimmy Huang
jimmy.huang at intel.com
Thu Aug 26 02:20:53 UTC 2010
Hi,
I have made the following changes to ivihome in project Trunk:IVI. Please review and accept ASAP.
Thank You,
Jimmy Huang
[This message was auto-generated]
---
Request #7045:
submit: home:jhuang:branches:Trunk:IVI/ivihome(r2)(cleanup) -> Trunk:IVI/ivihome
Message:
Fixes bug #5288, #5489, #5656, and improved performance when scrolling with TTS on
State: new 2010-08-25T14:10:34 jhuang
Comment: None
changes files:
--------------
--- ivihome.changes
+++ ivihome.changes
@@ -0,0 +1,16 @@
+* Wed Aug 25 2010 Jimmy Huang <jimmy.huang at intel.com> - 1.12
+- Fixed bug#5288 - tts not enabled by default
+- Fixed bug#5489 - video not appear in the menu
+- Fixed bug#5656 - duicontrolpanel not appear in the menu
+- Fixed bug where mutex lock was causing menu scroll to be slow
+- Changed Activities to Media in the menu category
+
+* Wed Aug 17 2010 Jimmy Huang <jimmy.huang at intel.com> - 1.11
+- Moved all images to subdirectory for installation
+- Renamed all image file names
+- Renaming button state to eActive to ePressed
+- Fixed bug where selected_index is not set properly
+- Fixed bug#5409
+- Project file clean up
+- Fixed typos in README
+
old:
----
ivihome-1.11.tar.gz
new:
----
ivihome-1.12.tar.gz
spec files:
-----------
--- ivihome.spec
+++ ivihome.spec
@@ -7,7 +7,7 @@
Name: ivihome
Summary: Qt-based HMI for the IVI desktop that includes a taskbar and launcher
-Version: 1.11
+Version: 1.12
Release: 1
Group: System/GUI/Other
License: GPLv2+
@@ -42,7 +42,7 @@
%build
unset LD_AS_NEEDED
# >> build pre
-qmake install_prefix=/usr "DEFINES += TTS_SUPPORT"
+qmake install_prefix=/usr
# << build pre
@@ -67,10 +67,10 @@
%files
%defattr(-,root,root,-)
-# >> files
%{_bindir}/ivihome
%{_bindir}/startivi
%{_datadir}/ivihome/*
+# >> files
# << files
other changes:
--------------
++++++ ivihome-1.11.tar.gz -> ivihome-1.12.tar.gz
--- applicationlist.cpp
+++ applicationlist.cpp
@@ -211,18 +211,34 @@
}
exec = (char *)mb_dotdesktop_get_exec(mb);
- if(exec.contains("seaside", Qt::CaseInsensitive)||
- exec.contains("dialer", Qt::CaseInsensitive))
+
+ if(exec.contains("fennec", Qt::CaseInsensitive)||
+ exec.contains("Navit", Qt::CaseInsensitive))
+ {
+ AddEntry("Navigation", mb);
+ return;
+ } else if(exec.contains("dialer", Qt::CaseInsensitive)||
+ exec.contains("meego-handset-people", Qt::CaseInsensitive)||
+ exec.contains("meego-handset-email", Qt::CaseInsensitive))
+ {
+ AddEntry("Connect", mb);
+ return;
+ }else if(exec.contains("meegomusic", Qt::CaseInsensitive))
+ {
+ AddEntry("Music", mb);
+ return;
+ }else if(exec.contains("meegophotos", Qt::CaseInsensitive)||
+ exec.contains("video", Qt::CaseInsensitive))
{
- AddEntry(1, mb);
+ AddEntry("Media", mb);
return;
- } else if(exec.contains("mcp", Qt::CaseInsensitive))
+ }else if(exec.contains("controlpanel", Qt::CaseInsensitive))
{
- AddEntry(4, mb);
+ AddEntry("Tools", mb);
return;
- } else if(exec.contains("fennec", Qt::CaseInsensitive))
+ }else if(exec.contains("liveinst", Qt::CaseInsensitive))
{
- AddEntry(0, mb);
+ AddEntry("Live Install", mb);
return;
}
--- buttonitem.cpp
+++ buttonitem.cpp
@@ -82,7 +82,6 @@
e_state = ePRESSED;
}
update();
- emit clicked(event->button());
}
void ButtonItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
@@ -97,6 +96,8 @@
e_state = eENABLED;
update();
}
+
+ emit clicked(event->button());
}
void ButtonItem::setBehaviorFlags(int flags)
--- defines.h
+++ defines.h
@@ -42,8 +42,8 @@
#define MUSIC_ICON "/usr/share/ivihome/images/music.svg"
#define OTHER_ICONH "/usr/share/ivihome/images/other-hl.svg"
#define OTHER_ICON "/usr/share/ivihome/images/other.svg"
-#define ACTIVITIES_ICONH "/usr/share/ivihome/images/video-hl.svg"
-#define ACTIVITIES_ICON "/usr/share/ivihome/images/video.svg"
+#define MEDIA_ICONH "/usr/share/ivihome/images/video-hl.svg"
+#define MEDIA_ICON "/usr/share/ivihome/images/video.svg"
#define TOOLS_ICONH "/usr/share/ivihome/images/settings-hl.svg"
#define TOOLS_ICON "/usr/share/ivihome/images/images/settings.svg"
#define BACK_ICONH "/usr/share/ivihome/images/back-hl.png"
--- ivihome.pro
+++ ivihome.pro
@@ -13,6 +13,8 @@
LIBS += -lmb
INCLUDEPATH += /usr/include/libmb/
+DEFINES += "TTS_SUPPORT"
+
contains(DEFINES, TTS_SUPPORT) {
message(Building with TTS support...)
--- settings.h
+++ settings.h
@@ -34,17 +34,19 @@
const struct ApplicationCategory default_appcats[] = {
{ QString("Navigation"), QString(NAVIGATION_ICON), QString(NAVIGATION_ICONH),
- QString("Webservices,WebBrowser,Internet,Network") },
+ QString("Webservices,WebBrowser,Internet") },
{ QString("Connect"), QString(COMMUNICATE_ICON), QString(COMMUNICATE_ICONH),
- QString("Communications,Email,InstantMessaging.Telephony") },
+ QString("Communications,Email,InstantMessaging,Network,Telephony") },
{ QString("Music"), QString(MUSIC_ICON), QString(MUSIC_ICONH),
- QString("Media,Audio,Player") },
- { QString("Activities"), QString(ACTIVITIES_ICON), QString(ACTIVITIES_ICONH),
+ QString("Audio") },
+ { QString("Media"), QString(MEDIA_ICON), QString(MEDIA_ICONH),
QString("Games,AudioVideo,Video,Viewer,Education") },
{ QString("Tools"), QString(TOOLS_ICON), QString(TOOLS_ICONH),
QString("Tools,Office,Security,Settings,Utility,System,DesktopSettings,HardwareSettings,Documentation")},
{ QString("More"), QString(OTHER_ICON), QString(OTHER_ICONH),
NULL},
+ { QString("Live Install"), QString(OTHER_ICON), QString(OTHER_ICONH),
+ NULL},
#ifdef BACKBUTTON
{ QString("Back"), QString(BACK_ICON), QString(BACK_ICONH),
NULL},
--- settings.xml
+++ settings.xml
@@ -65,27 +65,27 @@
<closepanelbuttonimage_pressed>/usr/share/ivihome/images/closepanel-pressed.svg</closepanelbuttonimage_pressed>
<appdefaulticon>/usr/share/ivihome/images/app-default-icon.png</appdefaulticon>
### Remove this line to override the default settings -->
- <texttospeech>off</texttospeech>
+ <texttospeech>on</texttospeech>
<appcategory>
<name>Navigation</name>
<iconH>/usr/share/ivihome/images/nav-hl.svg</iconH>
<icon>/usr/share/ivihome/images/nav.svg</icon>
- <matches>Webservices,WebBrowser,Internet,Network</matches>
+ <matches>Webservices,WebBrowser,Internet</matches>
</appcategory>
<appcategory>
<name>Connect</name>
<iconH>/usr/share/ivihome/images/connect-hl.svg</iconH>
<icon>/usr/share/ivihome/images/connect.svg</icon>
- <matches>Communications,Email,InstantMessaging,Telephony</matches>
+ <matches>Communications,Email,InstantMessaging,Network,Telephony</matches>
</appcategory>
<appcategory>
<name>Music</name>
<iconH>/usr/share/ivihome/images/music-hl.svg</iconH>
<icon>/usr/share/ivihome/images/music.svg</icon>
- <matches>Media,Audio,Player</matches>
+ <matches>Media,Audio</matches>
</appcategory>
<appcategory>
- <name>Activities</name>
+ <name>Media</name>
<iconH>/usr/share/ivihome/images/video-hl.svg</iconH>
<icon>/usr/share/ivihome/images/video.svg</icon>
<matches>Games,AudioVideo,Video,Viewer,Education</matches>
@@ -106,4 +106,9 @@
the category will not show up in the scroll menu -->
<matches>*</matches>
</appcategory>
+ <appcategory>
+ <name>Live Install</name>
+ <iconH>/usr/share/ivihome/images/other-hl.svg</iconH>
+ <icon>/usr/share/ivihome/images/other.svg</icon>
+ </appcategory>
</settings>
--- taskwindow.cpp
+++ taskwindow.cpp
@@ -342,6 +342,7 @@
void TaskWindow::windowClicked(Window window, QString name)
{
+ Q_UNUSED(name);
// qDebug() << "switch to window " << name;
ws.setActiveWindow(window);
}
--- tts.cpp
+++ tts.cpp
@@ -61,22 +61,21 @@
while(!m_quit)
{
- // acquire lock
- m_mutex.lock();
-
// too much voice commands queued up, dumping everything except last
if(!m_speechQueue.isEmpty())
{
+ // acquire lock
+ m_mutex.lock();
do {
sentence = m_speechQueue.dequeue();
// qDebug() << "Removing from queue: " << sentence;
}
while(!m_speechQueue.isEmpty());
+ m_mutex.unlock();
festival_say_text((const char*) sentence.toLatin1());
qDebug() << "Say: " << sentence;
}
- m_mutex.unlock();
usleep(100);
}
@@ -88,18 +87,15 @@
if(!settings.texttospeech)
return;
#ifdef TTS_SUPPORT
- // acuire lock
- m_mutex.lock();
-
if(m_initialized)
{
+ // acuire lock
+ m_mutex.lock();
+
m_speechQueue.enqueue(sentence);
- m_mutex.unlock();
- // let's continue
+ m_mutex.unlock();
// qDebug() << "Adding to queue: " << sentence;
}
-
- m_mutex.unlock();
#endif
}
--- tts.h
+++ tts.h
@@ -49,6 +49,4 @@
QMutex m_mutex;
};
-
-
#endif // TTS_H
More information about the MeeGo-commits
mailing list