Revision: 6835
Author: nogu.dev
Date: Sat Dec 18 05:12:47 2010
Log: * qt4/toolbar/common-quimhelpertoolbar.cpp
- (QUimHelperToolbar::QUimHelperToolbar): Simplify.
Don't covert to QImage.
* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::UimStateIndicator,
UimStateIndicator::propListUpdate,
QHelperPopupMenu::insertHelperItem):
Ditto.
http://code.google.com/p/uim/source/detail?r=6835
Modified:
/trunk/qt4/toolbar/common-quimhelpertoolbar.cpp
/trunk/qt4/toolbar/common-uimstateindicator.cpp
=======================================
--- /trunk/qt4/toolbar/common-quimhelpertoolbar.cpp Fri Dec 17 17:44:22 2010
+++ /trunk/qt4/toolbar/common-quimhelpertoolbar.cpp Sat Dec 18 05:12:47 2010
@@ -38,7 +38,6 @@
#include <QtCore/QProcess>
#include <QtGui/QContextMenuEvent>
#include <QtGui/QHBoxLayout>
-#include <QtGui/QImage>
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
#include <QtGui/QToolButton>
@@ -72,34 +71,21 @@
connect( m_indicator, SIGNAL( menuRequested( QMenu* ) ),
this, SIGNAL( menuRequested( QMenu* ) ) );
- QPixmap swicon = QPixmap( ICONDIR + "/im_switcher.png" );
- QPixmap preficon = QPixmap( ACTION_ICONDIR + "/configure.png");
- QPixmap dicticon = QPixmap( ICONDIR + "/uim-dict.png");
- QPixmap padicon = QPixmap( ACTION_ICONDIR + "/format-text-bold.png");
- QPixmap handicon = QPixmap( ACTION_ICONDIR + "/document-edit.png");
- QPixmap helpicon = QPixmap( ACTION_ICONDIR + "/help-contents.png");
- QPixmap exiticon = QPixmap( ACTION_ICONDIR + "/window-close.png");
- QImage swimage = swicon.toImage();
- QImage prefimage = preficon.toImage();
- QImage dictimage = dicticon.toImage();
- QImage padimage = padicon.toImage();
- QImage handimage = handicon.toImage();
- QImage helpimage = helpicon.toImage();
- QImage exitimage = exiticon.toImage();
- m_swicon = QPixmap::fromImage( swimage.scaled( ICON_SIZE, ICON_SIZE,
- Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
- m_preficon = QPixmap::fromImage( prefimage.scaled( ICON_SIZE,
ICON_SIZE,
- Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
- m_dicticon = QPixmap::fromImage( dictimage.scaled( ICON_SIZE,
ICON_SIZE,
- Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
- m_padicon = QPixmap::fromImage( padimage.scaled( ICON_SIZE, ICON_SIZE,
- Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
- m_handicon = QPixmap::fromImage( handimage.scaled( ICON_SIZE,
ICON_SIZE,
- Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
- m_helpicon = QPixmap::fromImage( helpimage.scaled( ICON_SIZE,
ICON_SIZE,
- Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
- exiticon = QPixmap::fromImage( exitimage.scaled( ICON_SIZE, ICON_SIZE,
- Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
+ const QSize size( ICON_SIZE, ICON_SIZE );
+ m_swicon = QPixmap( ICONDIR + "/im_switcher.png" ).scaled(
+ size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+ m_preficon = QPixmap( ACTION_ICONDIR + "/configure.png" ).scaled(
+ size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+ m_dicticon = QPixmap( ICONDIR + "/uim-dict.png" ).scaled(
+ size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+ m_padicon = QPixmap( ACTION_ICONDIR + "/format-text-bold.png" ).scaled(
+ size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+ m_handicon = QPixmap( ACTION_ICONDIR + "/document-edit.png" ).scaled(
+ size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+ m_helpicon = QPixmap( ACTION_ICONDIR + "/help-contents.png" ).scaled(
+ size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+ QPixmap exiticon = QPixmap( ACTION_ICONDIR + "/window-close.png"
).scaled(
+ size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
m_contextMenu = new QMenu( isApplet ? 0 : this );
m_contextMenu->addAction( m_swicon, _("Switch input method"),
=======================================
--- /trunk/qt4/toolbar/common-uimstateindicator.cpp Mon Aug 9 21:19:47 2010
+++ /trunk/qt4/toolbar/common-uimstateindicator.cpp Sat Dec 18 05:12:47 2010
@@ -40,7 +40,6 @@
#include <QtCore/QStringList>
#include <QtCore/QTextCodec>
#include <QtGui/QHBoxLayout>
-#include <QtGui/QImage>
#include <QtGui/QMouseEvent>
#include <QtGui/QPixmap>
@@ -77,10 +76,8 @@
m_layout->addWidget( fallbackButton );
QPixmap icon = QPixmap( ICONDIR + '/' + "uim-icon.png" );
if ( !icon.isNull() ) {
- QImage image = icon.toImage();
- QPixmap scaledIcon = QPixmap::fromImage(
- image.scaled( ICON_SIZE, ICON_SIZE,
- Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
+ QPixmap scaledIcon = icon.scaled( ICON_SIZE, ICON_SIZE,
+ Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
fallbackButton->setIcon( QIcon( scaledIcon ) );
} else {
fallbackButton->setText( "?" );
@@ -189,10 +186,8 @@
}
QPixmap icon = QPixmap( fileName );
if (!icon.isNull()) {
- QImage image = icon.toImage();
- QPixmap scaledIcon = QPixmap::fromImage(
- image.scaled( ICON_SIZE, ICON_SIZE,
- Qt::IgnoreAspectRatio,
Qt::SmoothTransformation ) );
+ QPixmap scaledIcon = icon.scaled( ICON_SIZE, ICON_SIZE,
+ Qt::IgnoreAspectRatio,
Qt::SmoothTransformation );
button->setIcon( QIcon( scaledIcon ) );
} else {
button->setText( fields[ 2 ] );
@@ -356,10 +351,8 @@
QPixmap icon = QPixmap ( fileName );
if (!icon.isNull()) {
- QImage image = icon.toImage();
- QPixmap scaledIcon = QPixmap::fromImage(
- image.scaled( ICON_SIZE, ICON_SIZE,
- Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
+ QPixmap scaledIcon = icon.scaled( ICON_SIZE, ICON_SIZE,
+ Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
action = addAction( scaledIcon, menulabelStr );
} else {
action = addAction( menulabelStr );
