# HG changeset patch # User lbajardsilogic # Date 1195119872 0 # Node ID 98df77b4f041bbd7411bf0fc9abe891f1a9eb1f0 # Parent 46688275b5d4a7c90ab1b6a4526c4e990e953b1f add pdf icon for related media and restrain image size diff -r 46688275b5d4 -r 98df77b4f041 sv/icons/icon_pdf.png Binary file sv/icons/icon_pdf.png has changed diff -r 46688275b5d4 -r 98df77b4f041 sv/sound-access.qrc --- a/sv/sound-access.qrc Thu Nov 15 09:19:15 2007 +0000 +++ b/sv/sound-access.qrc Thu Nov 15 09:44:32 2007 +0000 @@ -65,22 +65,22 @@ icons/interval.png icons/connected.png icons/notconnected.png - - icons/layerViewer_btn_config.png - icons/layerViewer_btn_down.png - icons/layerViewer_btn_new.png - icons/layerViewer_btn_remove.png - icons/layerViewer_btn_up.png - icons/drag.png - icons/easaier.png - icons/splashscreen.png - icons/musicIcon.png - icons/speechIcon.png - icons/prev.png - icons/similar.png - icons/addToLayer.png - - samples/bass.wav + icons/layerViewer_btn_config.png + icons/layerViewer_btn_down.png + icons/layerViewer_btn_new.png + icons/layerViewer_btn_remove.png + icons/layerViewer_btn_up.png + icons/drag.png + icons/easaier.png + icons/splashscreen.png + icons/musicIcon.png + icons/speechIcon.png + icons/prev.png + icons/similar.png + icons/addToLayer.png + icons/icon_pdf.png + + samples/bass.wav samples/beep.wav samples/bounce.wav samples/clap.wav diff -r 46688275b5d4 -r 98df77b4f041 sv/sound_access.vcproj --- a/sv/sound_access.vcproj Thu Nov 15 09:19:15 2007 +0000 +++ b/sv/sound_access.vcproj Thu Nov 15 09:44:32 2007 +0000 @@ -1062,6 +1062,10 @@ > + + diff -r 46688275b5d4 -r 98df77b4f041 widgets/RelatedMediaWidget.cpp --- a/widgets/RelatedMediaWidget.cpp Thu Nov 15 09:19:15 2007 +0000 +++ b/widgets/RelatedMediaWidget.cpp Thu Nov 15 09:44:32 2007 +0000 @@ -55,8 +55,35 @@ void RelatedMediaWidget::addRelatedMedia(const QString &filename) { + QString imageSource; + QString extension = filename.right(filename.length() - (filename.lastIndexOf('.') + 1)); + + int width; + int height; + int maxHeight = 150; + + if (extension == "pdf") + { + imageSource = ":icons/icon_pdf.png"; + } else + { + imageSource = filename; + } + + QPixmap image(imageSource); + if (image.height() > maxHeight) + { + height = maxHeight; + width = image.width() * maxHeight / image.height(); + } else + { + height = image.height(); + width = image.width(); + } + QLabel *mediaLabel = new QLabel(); - mediaLabel->setText("
 "); + mediaLabel->setText("
 "); connect(mediaLabel, SIGNAL(linkActivated(QString)), MainWindow::instance(), SLOT(runExternProcess(QString)));