Part of batch commit to enable true tasktray resize support for Trinity applications

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/knemo@1124764 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 5c528607a9
commit 301036d85a

@ -88,24 +88,24 @@ void InterfaceIcon::updateStatus( int status )
if ( status == Interface::NOT_AVAILABLE ||
status == Interface::NOT_EXISTING )
{
mTray->setPixmap( mTray->loadIcon( ICON_DISCONNECTED + suffix ) );
mTray->setPixmap( mTray->loadSizedIcon( ICON_DISCONNECTED + suffix, mTray->width() ) );
}
else if ( ( status & Interface::RX_TRAFFIC ) &&
( status & Interface::TX_TRAFFIC ) )
{
mTray->setPixmap( mTray->loadIcon( ICON_TRAFFIC + suffix ) );
mTray->setPixmap( mTray->loadSizedIcon( ICON_TRAFFIC + suffix, mTray->width() ) );
}
else if ( status & Interface::RX_TRAFFIC )
{
mTray->setPixmap( mTray->loadIcon( ICON_INCOMING + suffix ) );
mTray->setPixmap( mTray->loadSizedIcon( ICON_INCOMING + suffix, mTray->width() ) );
}
else if ( status & Interface::TX_TRAFFIC )
{
mTray->setPixmap( mTray->loadIcon( ICON_OUTGOING + suffix ) );
mTray->setPixmap( mTray->loadSizedIcon( ICON_OUTGOING + suffix, mTray->width() ) );
}
else
{
mTray->setPixmap( mTray->loadIcon( ICON_CONNECTED + suffix ) );
mTray->setPixmap( mTray->loadSizedIcon( ICON_CONNECTED + suffix, mTray->width() ) );
}
}
@ -150,6 +150,11 @@ void InterfaceIcon::updateMenu()
}
}
void InterfaceIcon::resizeIcon()
{
updateTrayStatus(0);
}
void InterfaceIcon::updateTrayStatus( int previousState )
{
bool interfaceExists = mInterface->getData().existing;
@ -236,6 +241,8 @@ void InterfaceIcon::updateTrayStatus( int previousState )
mInterface, SLOT( showSignalPlotter( bool ) ) );
connect( mTray, SIGNAL( configSelected() ),
this, SLOT( showConfigDialog() ) );
connect( mTray, SIGNAL( iconResized() ),
this, SLOT( resizeIcon() ) );
updateStatus( mInterface->getState() );
updateToolTip();

@ -74,6 +74,11 @@ public slots:
*/
void updateTrayStatus( int previousState );
/*
* Resizes the tray icon
*/
void resizeIcon();
private slots:
/*
* Called when the user selects 'Configure KNemo' from the context menu

@ -65,6 +65,12 @@ InterfaceTray::~InterfaceTray()
{
}
void InterfaceTray::resizeEvent ( QResizeEvent * )
{
// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
emit iconResized();
}
void InterfaceTray::mousePressEvent( QMouseEvent* e )
{
if ( !rect().contains( e->pos() ) )

@ -54,9 +54,11 @@ signals:
void configSelected();
void startCommandSelected();
void stopCommandSelected();
void iconResized();
protected:
void mousePressEvent( QMouseEvent* e );
void resizeEvent ( QResizeEvent * );
protected slots:
/**

Loading…
Cancel
Save