summaryrefslogtreecommitdiff
path: root/muse2/muse
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2010-11-18 08:27:32 +0000
committerTim E. Real <termtech@rogers.com>2010-11-18 08:27:32 +0000
commit670e396ad8eb962ea7e37720ef91d79106994bc5 (patch)
tree864cb0bf7950b6e3aedfca296294d84ac0bef83f /muse2/muse
parentb1b4e15d4eba560fa1898c1ba840a24d66e439c0 (diff)
Updated build part of README file - read it! Tell user to specify Release build type.
Add printout of build type, and remove duplicate LASH detection, in top level cmake. Patch by Orcan for pre-Qt4.6 filedialog icons.
Diffstat (limited to 'muse2/muse')
-rw-r--r--muse2/muse/widgets/filedialog.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp
index c86a507e..cd4fff91 100644
--- a/muse2/muse/widgets/filedialog.cpp
+++ b/muse2/muse/widgets/filedialog.cpp
@@ -172,13 +172,13 @@ MFileDialog::MFileDialog(const QString& dir,
// Qt >= 4.6 allows us to select icons from the theme
#if QT_VERSION >= 0x040600
- buttons.globalButton->setIcon(QIcon::fromTheme("folder", QIcon(":/icons/global.xpm")));
- buttons.userButton->setIcon(QIcon::fromTheme("user-home", QIcon(":/icons/user.xpm")));
- buttons.projectButton->setIcon(QIcon::fromTheme("folder-sound", QIcon(":/icons/project.xpm")));
+ buttons.globalButton->setIcon(QIcon::fromTheme("folder", style()->standardIcon(QStyle::SP_DirIcon)));
+ buttons.userButton->setIcon(QIcon::fromTheme("user-home", style()->standardIcon(QStyle::SP_DirHomeIcon)));
+ buttons.projectButton->setIcon(QIcon::fromTheme("folder-sound", style()->standardIcon(QStyle::SP_DirOpenIcon)));
#else
- buttons.globalButton->setIcon(QIcon(":/icons/global.xpm"));
- buttons.userButton->setIcon(QIcon(":/icons/user.xpm"));
- buttons.projectButton->setIcon(QIcon(":/icons/project.xpm"));
+ buttons.globalButton->setIcon(style()->standardIcon(QStyle::SP_DirIcon));
+ buttons.userButton->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
+ buttons.projectButton->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon));
#endif
connect(buttons.globalButton, SIGNAL(toggled(bool)), this, SLOT(globalToggled(bool)));