diff options
Diffstat (limited to 'muse2/muse/appearance.cpp')
| -rw-r--r-- | muse2/muse/appearance.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/muse2/muse/appearance.cpp b/muse2/muse/appearance.cpp index b3e89aa1..178c6bd8 100644 --- a/muse2/muse/appearance.cpp +++ b/muse2/muse/appearance.cpp @@ -48,6 +48,8 @@ #include "conf.h" #include "gconfig.h" +namespace MusEGui { + int BG_ITEM_HEIGHT = 30; class BgPreviewWidget : public QWidget { @@ -116,13 +118,13 @@ class IdListViewItem : public QTreeWidgetItem { // Appearance //--------------------------------------------------------- -Appearance::Appearance(MusEArranger::Arranger* a, QWidget* parent) +Appearance::Appearance(Arranger* a, QWidget* parent) : QDialog(parent, Qt::Window) { setupUi(this); arr = a; color = 0; - config = new MusEConfig::GlobalConfigValues; + config = new GlobalConfigValues; lastSelectedColorItem = 0; lastSelectedBgItem = 0; @@ -208,7 +210,7 @@ Appearance::Appearance(MusEArranger::Arranger* a, QWidget* parent) new IdListViewItem(0x410, id, "Saxophon"); */ for(int i = 0; i < NUM_PARTCOLORS; ++i) - new IdListViewItem(0x400 + i, id, MusEConfig::config.partColorNames[i]); + new IdListViewItem(0x400 + i, id, MusEGlobal::config.partColorNames[i]); new IdListViewItem(0x41c, aid, "part canvas background"); id = new IdListViewItem(0, aid, "Track List"); @@ -323,7 +325,7 @@ Appearance::Appearance(MusEArranger::Arranger* a, QWidget* parent) void Appearance::resetValues() { - *config = MusEConfig::config; // init with global config values + *config = MusEGlobal::config; // init with global config values styleSheetPath->setText(config->styleSheetFile); updateFonts(); @@ -698,7 +700,7 @@ void Appearance::apply() config->globalAlphaBlend = globalAlphaVal->value(); // set colors... - MusEConfig::config = *config; + MusEGlobal::config = *config; MusEGlobal::muse->changeConfig(true); } @@ -765,7 +767,7 @@ void Appearance::removeBackground() void Appearance::addBackground() { QString cur = getenv("HOME"); - QString user_bgfile = MusEWidget::getImageFileName(cur, MusEGlobal::image_file_pattern, this, + QString user_bgfile = getImageFileName(cur, MusEGlobal::image_file_pattern, this, tr("MusE: load image")); bool image_exists = false; @@ -1137,3 +1139,5 @@ void Appearance::browseFont(int n) } } +} // namespace MusEGui + |