[meego-commits] 6817: Changes to Trunk:IVI/ivihome
Jimmy Huang
jimmy.huang at intel.com
Wed Aug 18 22:45:36 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 #6817:
submit: home:jhuang:branches:Trunk:IVI/ivihome(r2)(cleanup) -> Trunk:IVI/ivihome
Message:
bump to version 1.11, fixed text-to-speech bug#5409 #5494, renamed image files
State: new 2010-08-18T10:36:09 jhuang
Comment: None
changes files:
--------------
old:
----
ivihome-1.10.tar.gz
new:
----
ivihome-1.11.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.10
+Version: 1.11
Release: 1
Group: System/GUI/Other
License: GPLv2+
other changes:
--------------
++++++ ivihome-1.10.tar.gz -> ivihome-1.11.tar.gz
--- README
+++ README
@@ -10,7 +10,10 @@
============
- Qt
- libmatchbox
-- festival (optional for text-to-speech support)
+- matchbox window manager (runtime)
+
+Test-to-speech suupport:
+- festival
building
========
@@ -34,6 +37,6 @@
/usr/bin/ivihome
-ivihome included a script startivi responsible for running ividesktop and ivihome.
+ivihome includes a script startivi responsible for running ividesktop and ivihome.
/usr/bin/startivi
--- buttonitem.cpp
+++ buttonitem.cpp
@@ -31,11 +31,13 @@
{
}
-void ButtonItem::setImages(const QPixmap & itemImage,
- const QPixmap & itemImageH)
+void ButtonItem::setImages(const QPixmap &itemImage,
+ const QPixmap &itemImageInactive,
+ const QPixmap &itemImagePressed)
{
p_image = itemImage;
- p_imageH = itemImageH;
+ p_imageInactive = itemImageInactive;
+ p_imagePressed = itemImagePressed;
}
void ButtonItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget)
@@ -51,10 +53,15 @@
(size().height()-p_image.height())/2,
p_image);
break;
- case eACTIVE:
- painter->drawPixmap((size().width()-p_imageH.width())/2,
- (size().height()-p_imageH.height())/2,
- p_imageH);
+ case eDISABLED:
+ painter->drawPixmap((size().width()-p_imageInactive.width())/2,
+ (size().height()-p_imageInactive.height())/2,
+ p_imageInactive);
+ break;
+ case ePRESSED:
+ painter->drawPixmap((size().width()-p_imagePressed.width())/2,
+ (size().height()-p_imagePressed.height())/2,
+ p_imagePressed);
break;
}
}
@@ -66,7 +73,14 @@
if(e_state == eDISABLED)
return;
- e_state = eACTIVE;
+ if(e_state == ePRESSED)
+ {
+ e_state = eENABLED;
+ }
+ else if(e_state == eENABLED)
+ {
+ e_state = ePRESSED;
+ }
update();
emit clicked(event->button());
}
--- buttonitem.h
+++ buttonitem.h
@@ -30,7 +30,7 @@
enum eBUTTONSTATE
{
- eDISABLED,eENABLED,eACTIVE
+ eDISABLED,eENABLED,ePRESSED
};
class ButtonItem : public QGraphicsWidget
@@ -42,8 +42,9 @@
ButtonItem();
~ButtonItem();
void setBehaviorFlags(int flags);
- void setImages(const QPixmap & itemImage,
- const QPixmap & itemImageH);
+ void setImages(const QPixmap &itemImage,
+ const QPixmap &itemImageInactive,
+ const QPixmap &itemImagePressed);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget);
void setState(int newstate);
int getState();
@@ -55,7 +56,8 @@
int m_flags;
int e_state;
QPixmap p_image;
- QPixmap p_imageH;
+ QPixmap p_imageInactive;
+ QPixmap p_imagePressed;
QPixmap background;
protected:
--- defines.h
+++ defines.h
@@ -27,27 +27,27 @@
#define ICONDIR "/usr/share/icons/"
#define APPLICATION_FOLDER "/usr/share/applications/"
#define HANDSETICON_FOLDER "/usr/share/themes/base/dui/icons"
-#define SCROLLMENU_IMAGE "/usr/share/ivihome/scrollmenubar.png"
-#define BACKGROUND_IMAGE "/usr/share/ivihome/taskbar.png"
+#define SCROLLMENU_IMAGE "/usr/share/ivihome/images/scrollmenubar.png"
+#define BACKGROUND_IMAGE "/usr/share/ivihome/images/taskbar.png"
#define TASK_ITEM_WIDTH 50
#define TASK_ITEM_HEIGHT 50
#define LAUNCH_ITEM_HEIGHT LAUNCH_ITEM_GAP
#define LAUNCH_ITEM_GAP 78
#define LAUNCH_ITEM_OFFSET 0
-#define COMMUNICATE_ICONH "/usr/share/ivihome/connect-active.svg"
-#define COMMUNICATE_ICON "/usr/share/ivihome/connect-inactive.svg"
-#define NAVIGATION_ICONH "/usr/share/ivihome/nav-active.svg"
-#define NAVIGATION_ICON "/usr/share/ivihome/nav-inactive.svg"
-#define MUSIC_ICONH "/usr/share/ivihome/music-active.svg"
-#define MUSIC_ICON "/usr/share/ivihome/music-inactive.svg"
-#define OTHER_ICONH "/usr/share/ivihome/other-active.svg"
-#define OTHER_ICON "/usr/share/ivihome/other-inactive.svg"
-#define ACTIVITIES_ICONH "/usr/share/ivihome/video-active.svg"
-#define ACTIVITIES_ICON "/usr/share/ivihome/video-inactive.svg"
-#define TOOLS_ICONH "/usr/share/ivihome/settings-active.svg"
-#define TOOLS_ICON "/usr/share/ivihome/settings-inactive.svg"
-#define BACK_ICONH "/usr/share/ivihome/back_icon_hl.png"
-#define BACK_ICON "/usr/share/ivihome/back_icon.png"
+#define COMMUNICATE_ICONH "/usr/share/ivihome/images/connect-hl.svg"
+#define COMMUNICATE_ICON "/usr/share/ivihome/images/connect.svg"
+#define NAVIGATION_ICONH "/usr/share/ivihome/images/nav-hl.svg"
+#define NAVIGATION_ICON "/usr/share/ivihome/images/nav.svg"
+#define MUSIC_ICONH "/usr/share/ivihome/images/music-hl.svg"
+#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 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"
+#define BACK_ICON "/usr/share/ivihome/images/back.png"
#define SETTINGSFILE "/usr/share/ivihome/settings.xml"
//#define BACKBUTTON
--- images/back-hl.png
+++ images/back-hl.png
(renamed from images/back_icon_hl.png)
--- images/back.png
+++ images/back.png
(renamed from images/back_icon.png)
--- images/back_icon.png
+++ images/back_icon.png
(renamed to images/back.png)
--- images/back_icon_hl.png
+++ images/back_icon_hl.png
(renamed to images/back-hl.png)
--- images/close-active.svg
+++ images/close-active.svg
(renamed from images/close.svg)
--- images/close-pressed.svg
+++ images/close-pressed.svg
(renamed from images/closeH.svg)
--- images/close.svg
+++ images/close.svg
(renamed to images/close-active.svg)
--- images/closeH.svg
+++ images/closeH.svg
(renamed to images/close-pressed.svg)
--- images/closepanel-active.svg
+++ images/closepanel-active.svg
(renamed from images/panel-inactive.svg)
--- images/closepanel-pressed.svg
+++ images/closepanel-pressed.svg
(renamed from images/panel-pressed.svg)
--- images/connect-active.svg
+++ images/connect-active.svg
(renamed to images/connect-hl.svg)
--- images/connect-hl.svg
+++ images/connect-hl.svg
(renamed from images/connect-active.svg)
--- images/connect-inactive.svg
+++ images/connect-inactive.svg
(renamed to images/connect.svg)
--- images/connect.svg
+++ images/connect.svg
(renamed from images/connect-inactive.svg)
--- images/home-active.svg
+++ images/home-active.svg
(renamed from images/home.svg)
--- images/home-pressed.svg
+++ images/home-pressed.svg
(renamed from images/homeH.svg)
--- images/home.svg
+++ images/home.svg
(renamed to images/home-active.svg)
--- images/homeH.svg
+++ images/homeH.svg
(renamed to images/home-pressed.svg)
--- images/music-active.svg
+++ images/music-active.svg
(renamed to images/music-hl.svg)
--- images/music-hl.svg
+++ images/music-hl.svg
(renamed from images/music-active.svg)
--- images/music-inactive.svg
+++ images/music-inactive.svg
(renamed to images/music.svg)
--- images/music.svg
+++ images/music.svg
(renamed from images/music-inactive.svg)
--- images/nav-active.svg
+++ images/nav-active.svg
(renamed to images/nav-hl.svg)
--- images/nav-hl.svg
+++ images/nav-hl.svg
(renamed from images/nav-active.svg)
--- images/nav-inactive.svg
+++ images/nav-inactive.svg
(renamed to images/nav.svg)
--- images/nav.svg
+++ images/nav.svg
(renamed from images/nav-inactive.svg)
--- images/other-active.svg
+++ images/other-active.svg
(renamed to images/other-hl.svg)
--- images/other-hl.svg
+++ images/other-hl.svg
(renamed from images/other-active.svg)
--- images/other-inactive.svg
+++ images/other-inactive.svg
(renamed to images/other.svg)
--- images/other.svg
+++ images/other.svg
(renamed from images/other-inactive.svg)
--- images/panel-inactive.svg
+++ images/panel-inactive.svg
(renamed to images/closepanel-active.svg)
--- images/panel-pressed.svg
+++ images/panel-pressed.svg
(renamed to images/closepanel-pressed.svg)
--- images/settings-active.svg
+++ images/settings-active.svg
(renamed to images/settings-hl.svg)
--- images/settings-hl.svg
+++ images/settings-hl.svg
(renamed from images/settings-active.svg)
--- images/settings-inactive.svg
+++ images/settings-inactive.svg
(renamed to images/settings.svg)
--- images/settings.svg
+++ images/settings.svg
(renamed from images/settings-inactive.svg)
--- images/video-active.svg
+++ images/video-active.svg
(renamed to images/video-hl.svg)
--- images/video-hl.svg
+++ images/video-hl.svg
(renamed from images/video-active.svg)
--- images/video-inactive.svg
+++ images/video-inactive.svg
(renamed to images/video.svg)
--- images/video.svg
+++ images/video.svg
(renamed from images/video-inactive.svg)
--- ivihome.pro
+++ ivihome.pro
@@ -5,20 +5,27 @@
TARGET = ivihome
TEMPLATE = app
-LIBS += -lX11 -lmb
-INCLUDEPATH += $$PREFIX/include/libmb/
-
-CONFIG += qt thread
+CONFIG += qt thread link_pkgconfig
QT += opengl
+PKGCONFIG += x11
+
+LIBS += -lmb
+INCLUDEPATH += /usr/include/libmb/
+
contains(DEFINES, TTS_SUPPORT) {
message(Building with TTS support...)
-LIBS += -lFestival -lestools -lestbase -leststring -ltermcap
+LIBS += -lFestival \
+ -lestools \
+ -lestbase \
+ -leststring \
+ -ltermcap
+
+INCLUDEPATH += /usr/include/festival/ \
+ /usr/include/speech_tools/ \
+ /usr/include/speech_tools/instantiate/EST/
-INCLUDEPATH += $$PREFIX/include/festival/ \
- $$PREFIX/include/speech_tools/ \
- $$PREFIX/include/speech_tools/instantiate/EST/
}
SOURCES += main.cpp \
@@ -60,14 +67,14 @@
DATADIR = $$PREFIX/share
# set them up to install
-INSTALLS += target script images config
+INSTALLS += target settings script images
target.path = $$BINDIR
# additional install targets
script.path = $$BINDIR
script.files = startivi
-images.path = $$DATADIR/ivihome
+settings.path = $$DATADIR/ivihome
+settings.files = settings.xml
+images.path = $$DATADIR/ivihome/images
images.files = images/*
-config.path = $$DATADIR/ivihome
-config.files = settings.xml
--- launchwindow.cpp
+++ launchwindow.cpp
@@ -92,6 +92,7 @@
connect(m_menu,SIGNAL(itemClicked(int,QString)),this,SLOT(categoryClicked(const int &, const QString &)));
connect(m_menu,SIGNAL(itemRightClicked(int,QString)),this,SLOT(categoryRightClicked(const int &, const QString &)));
+ connect(m_menu,SIGNAL(itemChanged(int,QString)),this,SLOT(itemChanged(const int &, const QString &)));
connect(m_menu,SIGNAL(itemScrolled(int)),this,SLOT(itemScrolled(const int &)));
updateAppMenu();
@@ -158,6 +159,8 @@
addItem(m_menu_app);
connect(m_menu_app,SIGNAL(itemClicked(int,QString)),this,SLOT(appClicked(const int &, const QString &)));
connect(m_menu_app,SIGNAL(itemRightClicked(int,QString)),this,SLOT(appRightClicked(const int &, const QString &)));
+ connect(m_menu_app,SIGNAL(itemChanged(int,QString)),this,SLOT(itemChanged(const int &, const QString &)));
+
for(i = 0; i < appinfolist->size(); i++)
{
QPixmap pixmap;
@@ -189,6 +192,13 @@
return;
}
+void LaunchWindow::itemChanged(const int &itemId, const QString &itemName)
+{
+ Q_UNUSED(itemId);
+ emit menuItemFocusChanged(itemName);
+ return;
+}
+
void LaunchWindow::appClicked(const int &id, const QString &appname)
{
Q_UNUSED(appname);
--- launchwindow.h
+++ launchwindow.h
@@ -61,6 +61,7 @@
void categoryRightClicked(const int &id, const QString &mainMenu);
void appClicked(const int &id, const QString &mainMenu);
void appRightClicked(const int &id, const QString &mainMenu);
+ void itemChanged(const int &itemId, const QString &itemName);
void itemScrolled(const int &delta);
void catMenuMovein();
void catMenuMoveout();
--- scrollMenuList.cpp
+++ scrollMenuList.cpp
@@ -255,6 +255,7 @@
p_currectItem->setCurrectItem(false);
p_currectItem = item;
p_currectItem->setCurrectItem(true);
+ selectedIndex = p_currectItem->getItemID();
isItemChanged = true;
}
}
--- settings.cpp
+++ settings.cpp
@@ -38,13 +38,13 @@
taskbar_width = 100;
launcher_width = 360;
font = QFont("Sans", 14, 75, false);
- launchbuttonimage = "/usr/share/ivihome/home.svg";
- launchbuttonimageH = "/usr/share/ivihome/homeH.svg";
- closebuttonimage = "/usr/share/ivihome/close.svg";
- closebuttonimageH = "/usr/share/ivihome/closeH.svg";
- backbuttonimage = "/usr/share/ivihome/panel-inactive.svg";
- backbuttonimageH = "/usr/share/ivihome/panel-pressed.svg";
- appdefaulticon = "/usr/share/ivihome/app-default-icon.png";
+ launchbuttonimage = "/usr/share/ivihome/images/home-active.svg";
+ launchbuttonimage_pressed = "/usr/share/ivihome/images/home-pressed.svg";
+ closebuttonimage = "/usr/share/ivihome/images/close-active.svg";
+ closebuttonimage_pressed = "/usr/share/ivihome/images/close-pressed.svg";
+ closepanelbuttonimage = "/usr/share/ivihome/images/closepanel-active.svg";
+ closepanelbuttonimage_pressed = "/usr/share/ivihome/images/closepanel-pressed.svg";
+ appdefaulticon = "/usr/share/ivihome/images/app-default-icon.png";
texttospeech = false;
/* now override the defaults with the settings file */
@@ -223,31 +223,46 @@
QFile fp(data);
if(fp.exists())
launchbuttonimage = data;
- } else if(name == "launchbuttonimageH")
+ } else if(name == "launchbuttonimage_inactive")
{
QFile fp(data);
if(fp.exists())
- launchbuttonimageH = data;
+ launchbuttonimage_inactive = data;
+ } else if(name == "launchbuttonimage_pressed")
+ {
+ QFile fp(data);
+ if(fp.exists())
+ launchbuttonimage_pressed = data;
} else if(name == "closebuttonimage")
{
QFile fp(data);
if(fp.exists())
closebuttonimage = data;
- } else if(name == "closebuttonimageH")
+ } else if(name == "closebuttonimage_inactive")
+ {
+ QFile fp(data);
+ if(fp.exists())
+ closebuttonimage_inactive = data;
+ } else if(name == "closebuttonimage_pressed")
{
QFile fp(data);
if(fp.exists())
- closebuttonimageH = data;
- } else if(name == "backbuttonimage")
+ closebuttonimage_pressed = data;
+ } else if(name == "closepanelbuttonimage")
{
QFile fp(data);
if(fp.exists())
- backbuttonimage = data;
- } else if(name == "backbuttonimageH")
+ closepanelbuttonimage = data;
+ } else if(name == "closepanelbuttonimage_inactive")
{
QFile fp(data);
if(fp.exists())
- backbuttonimageH = data;
+ closepanelbuttonimage_inactive = data;
+ } else if(name == "closepanelbuttonimage_pressed")
+ {
+ QFile fp(data);
+ if(fp.exists())
+ closepanelbuttonimage_pressed = data;
} else if(name == "appdefaulticon")
{
QFile fp(data);
@@ -260,8 +275,11 @@
}
}
}
- else
+
+ if(this->m_appCategories.isEmpty())
{
+ // something went wrong, either settings.xml is missing or parsing error
+ // get to default category list
#ifdef BACKBUTTON
int cat_size = 6;
#else
--- settings.h
+++ settings.h
@@ -73,11 +73,14 @@
uint launcher_width;
QFont font;
QString launchbuttonimage;
- QString launchbuttonimageH;
+ QString launchbuttonimage_inactive;
+ QString launchbuttonimage_pressed;
QString closebuttonimage;
- QString closebuttonimageH;
- QString backbuttonimage;
- QString backbuttonimageH;
+ QString closebuttonimage_inactive;
+ QString closebuttonimage_pressed;
+ QString closepanelbuttonimage;
+ QString closepanelbuttonimage_inactive;
+ QString closepanelbuttonimage_pressed;
QString appdefaulticon;
bool texttospeech;
--- settings.xml
+++ settings.xml
@@ -30,18 +30,21 @@
launcher_width[uint]: the width of the launcher in pixels
font[font]: The font to be used when drawing any text
launchbuttonimage[filepath]: launch button on the task bar
- launchbuttonimageH[filepath]: highlighted launch button
+ launchbuttonimage_inactive[filepath]: disabled launch button
+ launchbuttonimage_pressed[filepath]: pressed launch button
closebuttonimage[filepath]: close button on the task bar
- closebuttonimageH[filepath]: highlighted close button
- backbuttonimage[filepath]: menu back button on the task bar
- backbuttonimageH[filepath]: highlighted menu back button on the task bar
+ closebuttonimage_inactive[filepath]: inactive close button
+ closebuttonimage_pressed[filepath]: pressed close button
+ closepanelbuttonimage[filepath]: menu back button on the task bar
+ closepanelbuttonimage_inactive[filepath]: inactive menu back button on the task bar
+ closepanelbuttonimage_pressed[filepath]: pressed menu back button on the task bar
appdefaulticon[filepath]: app icon for apps not specifying one
texttospeech[on/off]: toggles text-to-speech on/off
-->
<settings>
-<!-- Use this to override the default settings
+<!--### Remove this line to override the default settings
<taskbar_bgcolor1>ff262626</taskbar_bgcolor1>
<taskbar_bgcolor2>ff8686f6</taskbar_bgcolor2>
<taskbar_bgcolor3>ff262626</taskbar_bgcolor3>
@@ -54,49 +57,49 @@
<taskbar_width>100</taskbar_width>
<launcher_width>360</launcher_width>
<font>Sans,16,75,0</font>
- <launchbuttonimage>/usr/share/ivihome/home.svg</launchbuttonimage>
- <launchbuttonimageH>/usr/share/ivihome/homeH.svg</launchbuttonimageH>
- <closebuttonimage>/usr/share/ivihome/close.svg</closebuttonimage>
- <closebuttonimageH>/usr/share/ivihome/closeH.svg</closebuttonimageH>
- <backbuttonimage>/usr/share/ivihome/panel-inactive.svg</closebuttonimage>
- <backbuttonimageH>/usr/share/ivihome/panel-pressed.svg</closebuttonimageH>
- <appdefaulticon>/usr/share/ivihome/app-default-icon.png</appdefaulticon>
--->
+ <launchbuttonimage>/usr/share/ivihome/images/home-active.svg</launchbuttonimage>
+ <launchbuttonimage_pressed>/usr/share/ivihome/images/home-pressed.svg</launchbuttonimage_pressed>
+ <closebuttonimage>/usr/share/ivihome/images/close-active.svg</closebuttonimage>
+ <closebuttonimage_pressed>/usr/share/ivihome/images/close-pressed.svg</closebuttonimage_pressed>
+ <closepanelbuttonimage>/usr/share/ivihome/images/closepanel-active.png</closepanelbuttonimage>
+ <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>
<appcategory>
<name>Navigation</name>
- <iconH>/usr/share/ivihome/nav-active.svg</iconH>
- <icon>/usr/share/ivihome/nav-inactive.svg</icon>
+ <iconH>/usr/share/ivihome/images/nav-hl.svg</iconH>
+ <icon>/usr/share/ivihome/images/nav.svg</icon>
<matches>Webservices,WebBrowser,Internet,Network</matches>
</appcategory>
<appcategory>
<name>Connect</name>
- <iconH>/usr/share/ivihome/connect-active.svg</iconH>
- <icon>/usr/share/ivihome/connect-inactive.svg</icon>
+ <iconH>/usr/share/ivihome/images/connect-hl.svg</iconH>
+ <icon>/usr/share/ivihome/images/connect.svg</icon>
<matches>Communications,Email,InstantMessaging,Telephony</matches>
</appcategory>
<appcategory>
<name>Music</name>
- <iconH>/usr/share/ivihome/music-active.svg</iconH>
- <icon>/usr/share/ivihome/music-inactive.svg</icon>
+ <iconH>/usr/share/ivihome/images/music-hl.svg</iconH>
+ <icon>/usr/share/ivihome/images/music.svg</icon>
<matches>Media,Audio,Player</matches>
</appcategory>
<appcategory>
<name>Activities</name>
- <iconH>/usr/share/ivihome/video-active.svg</iconH>
- <icon>/usr/share/ivihome/video-inactive.svg</icon>
+ <iconH>/usr/share/ivihome/images/video-hl.svg</iconH>
+ <icon>/usr/share/ivihome/images/video.svg</icon>
<matches>Games,AudioVideo,Video,Viewer,Education</matches>
</appcategory>
<appcategory>
<name>Tools</name>
- <iconH>/usr/share/ivihome/settings-active.svg</iconH>
- <icon>/usr/share/ivihome/settings-inactive.svg</icon>
+ <iconH>/usr/share/ivihome/images/settings-hl.svg</iconH>
+ <icon>/usr/share/ivihome/images/settings.svg</icon>
<matches>Tools,Office,Security,Settings,Utility,System,DesktopSettings,HardwareSettings,Documentation</matches>
</appcategory>
<appcategory>
<name>More</name>
- <iconH>/usr/share/ivihome/other-active.svg</iconH>
- <icon>/usr/share/ivihome/other-inactive.svg</icon>
+ <iconH>/usr/share/ivihome/images/other-hl.svg</iconH>
+ <icon>/usr/share/ivihome/images/other.svg</icon>
<!-- If you specific "*" in the <matches>, it will group everything else that didn't
match above in here -->
<!-- Note! If you don't have this catagory, and if an app do not match any of the app categories,
--- taskwindow.cpp
+++ taskwindow.cpp
@@ -65,7 +65,9 @@
m_backgroundImage.setVisible(true);
m_backgroundImage.setZValue(-1);
- m_home.setImages(QPixmap(settings.launchbuttonimage), QPixmap(settings.launchbuttonimageH));
+ m_home.setImages(QPixmap(settings.launchbuttonimage),
+ QPixmap(settings.launchbuttonimage_inactive),
+ QPixmap(settings.launchbuttonimage_pressed));
m_home.setBehaviorFlags(FLAG_TOGGLE);
m_home.resize(settings.taskbar_width, settings.taskbar_width);
m_home.setPos(0, 0);
@@ -77,7 +79,9 @@
settings.taskbar_width,TASK_ITEM_WIDTH,rect.height()-(2*settings.taskbar_width));
m_windows->setZValue(100);
- m_close.setImages(QPixmap(settings.closebuttonimage), QPixmap(settings.closebuttonimageH));
+ m_close.setImages(QPixmap(settings.closebuttonimage),
+ QPixmap(settings.closebuttonimage_inactive),
+ QPixmap(settings.closebuttonimage_pressed));
m_close.resize(settings.taskbar_width, settings.taskbar_width);
m_close.setPos(0, rect.height()-settings.taskbar_width);
m_close.setVisible(true);
@@ -156,15 +160,15 @@
switch(m_launcherState)
{
case eCOLLAPSE:
- if(m_home.getState() == eACTIVE)
+ if(m_home.getState() == ePRESSED)
{
m_home.setState(eENABLED);
if(m_ttsEngine)
m_ttsEngine->say("cancel");
}
- else
+ else if(m_home.getState() == eENABLED)
{
- m_home.setState(eACTIVE);
+ m_home.setState(ePRESSED);
if(m_ttsEngine)
m_ttsEngine->say("home");
}
@@ -180,7 +184,7 @@
else if (code == BTN_4 && value ==1)
{
// qDebug() << "Back";
- if(m_home.getState() == eACTIVE)
+ if(m_home.getState() == ePRESSED)
{
switch(m_launcherState)
{
@@ -192,12 +196,17 @@
m_launcherState = -1;
break;
}
+ m_close.setState(ePRESSED);
}
}
+ else if (code == BTN_4 && value ==0)
+ {
+ m_close.setState(eENABLED);
+ }
else if (code == BTN_6 && value ==1)
{
// qDebug() << "Select Button Pressed";
- if(m_home.getState() == eACTIVE)
+ if(m_home.getState() == ePRESSED)
{
switch(m_launcherState)
{
@@ -215,7 +224,7 @@
break;
case EV_REL:
// qDebug() << "Relative Axis changed " << code << ", " << value;
- if(m_home.getState() == eACTIVE)
+ if(m_home.getState() == ePRESSED)
{
if (code == REL_WHEEL && value == 1)
{
@@ -286,12 +295,17 @@
{
m_launcher->hide();
m_home.setState(eENABLED);
- m_close.setImages(QPixmap(settings.closebuttonimage), QPixmap(settings.closebuttonimageH));
+ m_close.setImages(QPixmap(settings.closebuttonimage),
+ QPixmap(settings.closebuttonimage_inactive),
+ QPixmap(settings.closebuttonimage_pressed));
m_close.update();
}
else if(newstate == eEXPAND)
{
- m_close.setImages(QPixmap(settings.backbuttonimage), QPixmap(settings.backbuttonimageH));
+ m_close.setImages(QPixmap(settings.closepanelbuttonimage),
+ QPixmap(settings.closepanelbuttonimage_inactive),
+ QPixmap(settings.closepanelbuttonimage_pressed));
+ m_close.setState(eENABLED);
m_close.update();
}
m_launcherState = newstate;
++++++ ivihome.yaml
--- ivihome.yaml
+++ ivihome.yaml
@@ -1,6 +1,6 @@
Name: ivihome
Summary: Qt-based HMI for the IVI desktop that includes a taskbar and launcher
-Version: 1.10
+Version: 1.11
Release: 1
Group: System/GUI/Other
License: GPLv2+
More information about the MeeGo-commits
mailing list