Mercurial > hg > easaier-soundaccess
changeset 58:b3c3a5fa185f
frontend with easaier's look
| author | benoitrigolleau |
|---|---|
| date | Fri, 25 May 2007 12:36:35 +0000 |
| parents | 4f3e6a09239a |
| children | 57c85a9d9b4a |
| files | base/PlayParameters.cpp base/PlayParameters.h data/model/LayerItemModel.cpp sv/icons/easaier.png sv/icons/splashscreen.png sv/main/MainWindow.cpp sv/main/main.cpp sv/sound-access.qrc widgets/EasaierStyle.cpp widgets/EasaierStyle.h widgets/ItemLayerList.cpp widgets/ItemLayerList.h widgets/PropertyBox.cpp widgets/PropertyBox.h widgets/svwidgets.vcproj |
| diffstat | 15 files changed, 289 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/base/PlayParameters.cpp Wed May 23 15:11:52 2007 +0000 +++ b/base/PlayParameters.cpp Fri May 25 12:36:35 2007 +0000 @@ -56,6 +56,18 @@ } void +PlayParameters::setPlayAudible(int value) +{ + if(value==Qt::Checked){ + setPlayMuted(false); + }else if(value == Qt::Unchecked){ + setPlayMuted(true); + } +} + + + +void PlayParameters::setPlayPan(float pan) { if (m_playPan != pan) {
--- a/base/PlayParameters.h Wed May 23 15:11:52 2007 +0000 +++ b/base/PlayParameters.h Fri May 25 12:36:35 2007 +0000 @@ -40,6 +40,7 @@ public slots: virtual void setPlayMuted(bool muted); virtual void setPlayAudible(bool nonMuted); + virtual void setPlayAudible (int val); virtual void setPlayPan(float pan); virtual void setPlayGain(float gain); virtual void setPlayPluginId(QString id);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/model/LayerItemModel.cpp Fri May 25 12:36:35 2007 +0000 @@ -0,0 +1,58 @@ +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ + +/* +Sound Access +EASAIER client application. +Silogic 2007. Benoit Rigolleau. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. See the file +COPYING included with this distribution for more information. +*/ + +#include "LayerItemModel.h" + +LayerItemModel::LayerItemModel(QString &title, QString &icon, QColor &color, bool visible, bool audible): +m_title(title), +m_icon(icon), +m_color(color), +m_visible(visible), +m_audible(audible) +{ + +} + + +LayerItemModel::LayerItemModel(): +m_title(""), +m_icon(""), +m_color(QColor(0,0,0,0)), +m_visible(true), +m_audible(true) +{ +} + +LayerItemModel::LayerItemModel(const LayerItemModel &lim): +m_title(lim.getTitle()), +m_icon(lim.getIcon()), +m_color(lim.getColor()), +m_visible(lim.getVisible()), +m_audible(lim.getAudible()) +{ +} + +LayerItemModel::~LayerItemModel(){} + +QString LayerItemModel::getTitle() const{ return m_title; } +QString LayerItemModel::getIcon() const{ return m_icon; } +QColor LayerItemModel::getColor() const{ return m_color; } +bool LayerItemModel::getVisible() const{ return m_visible; } +bool LayerItemModel::getAudible() const{ return m_audible; } + +void LayerItemModel::setTitle(QString &title){ m_title=title; } +void LayerItemModel::setIcon(QString &icon){ m_icon=icon; } +void LayerItemModel::setColor(QColor &color){ m_color=color; } +void LayerItemModel::setVisible(bool visible){ m_visible=visible; } +void LayerItemModel::setAudible(bool audible){ m_audible=audible; } \ No newline at end of file
--- a/sv/main/MainWindow.cpp Wed May 23 15:11:52 2007 +0000 +++ b/sv/main/MainWindow.cpp Fri May 25 12:36:35 2007 +0000 @@ -283,9 +283,28 @@ m_toolBox->addItem("Layers", new QWidget); m_toolBox->addItem("Real-time filters", new LayerViewerWidget); + /******** only for logo ****/ + QLabel *logo = new QLabel; + logo->setPixmap(QPixmap(":icons/easaier.png")); + logo->setMinimumSize(0,0); + logo->setAlignment(Qt::AlignRight); + + QVBoxLayout *logoLayout= new QVBoxLayout; + logoLayout->setMargin(0); + logoLayout->setSpacing(0); + logoLayout->addWidget(m_toolBox); + logoLayout->addStretch(); + logoLayout->addWidget(logo); + + QWidget *widgetAuxForLogo = new QWidget; + widgetAuxForLogo->setLayout(logoLayout); + /****************************/ + + + ExpandWidget *mainExpandWidget = new ExpandWidget(); mainExpandWidget->setWidgetLocation(ExpandWidget::Location_Right); - mainExpandWidget->setPanes(bottomExpandWidget, m_toolBox); + mainExpandWidget->setPanes(bottomExpandWidget, widgetAuxForLogo); layout->addWidget(mainExpandWidget, 0, 0);
--- a/sv/main/main.cpp Wed May 23 15:11:52 2007 +0000 +++ b/sv/main/main.cpp Fri May 25 12:36:35 2007 +0000 @@ -21,6 +21,7 @@ #include "base/PropertyContainer.h" #include "base/Preferences.h" #include "widgets/TipDialog.h" +#include "widgets/EasaierStyle.h" #include <QMetaType> #include <QApplication> @@ -32,6 +33,7 @@ #include <QIcon> #include <QSessionManager> #include <QPlastiqueStyle> +#include <QSplashScreen> #include <iostream> #include <signal.h> @@ -195,8 +197,13 @@ int main(int argc, char **argv) { + SVApplication application(argc, argv); + QSplashScreen *splash = new QSplashScreen; + splash->setPixmap(QPixmap(":icons/splashscreen.png")); + splash->show(); + QStringList args = application.arguments(); signal(SIGINT, signalHandler); @@ -225,7 +232,8 @@ QApplication::setOrganizationDomain("easaier.org"); QApplication::setApplicationName("sound-access"); QApplication::setWindowIcon(QIcon(":icons/svicon16.png")); - QApplication::setStyle(new QPlastiqueStyle); + //QApplication::setStyle(new QPlastiqueStyle); + QApplication::setStyle(new EasaierStyle); QString language = QLocale::system().name(); @@ -265,7 +273,11 @@ } settings.endGroup(); + //delay(5000); + gui.show(); + splash->finish(&gui); + delete splash; // The MainWindow class seems to have trouble dealing with this if // it tries to adapt to this preference before the constructor is
--- a/sv/sound-access.qrc Wed May 23 15:11:52 2007 +0000 +++ b/sv/sound-access.qrc Fri May 25 12:36:35 2007 +0000 @@ -71,6 +71,8 @@ <file>icons/layerViewer_btn_remove.png</file> <file>icons/layerViewer_btn_up.png</file> <file>icons/drag.png</file> + <file>icons/easaier.png</file> + <file>icons/splashscreen.png</file> <file>samples/bass.wav</file> <file>samples/beep.wav</file> <file>samples/bounce.wav</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/widgets/EasaierStyle.cpp Fri May 25 12:36:35 2007 +0000 @@ -0,0 +1,59 @@ + +#include "EasaierStyle.h" + +QPalette EasaierStyle::standardPalette() const{ + QPalette palette; + + palette.setBrush(QPalette::Disabled, QPalette::WindowText, QColor(QRgb(0xff808080))); + palette.setBrush(QPalette::Disabled, QPalette::Button, QColor(QRgb(0xffdddfe4))); ////dddfe4 + palette.setBrush(QPalette::Disabled, QPalette::Light, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Disabled, QPalette::Midlight, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Disabled, QPalette::Dark, QColor(QRgb(0xff555555))); + palette.setBrush(QPalette::Disabled, QPalette::Mid, QColor(QRgb(0xffc7c7c7))); + palette.setBrush(QPalette::Disabled, QPalette::Text, QColor(QRgb(0xffc7c7c7))); + palette.setBrush(QPalette::Disabled, QPalette::BrightText, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Disabled, QPalette::ButtonText, QColor(QRgb(0xff808080))); + palette.setBrush(QPalette::Disabled, QPalette::Base, QColor(QRgb(0xffefefef))); + palette.setBrush(QPalette::Disabled, QPalette::AlternateBase, palette.color(QPalette::Disabled, QPalette::Base).dark(110)); + palette.setBrush(QPalette::Disabled, QPalette::Window, QColor(QRgb(0xffefefef))); + palette.setBrush(QPalette::Disabled, QPalette::Shadow, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Disabled, QPalette::Highlight, QColor(QRgb(0xffdbf756))); //567594 + palette.setBrush(QPalette::Disabled, QPalette::HighlightedText, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Disabled, QPalette::Link, QColor(QRgb(0xff0000ee))); + palette.setBrush(QPalette::Disabled, QPalette::LinkVisited, QColor(QRgb(0xff52188b))); + palette.setBrush(QPalette::Active, QPalette::WindowText, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Active, QPalette::Button, QColor(QRgb(0xffdddfe4))); //dddfe4 + palette.setBrush(QPalette::Active, QPalette::Light, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Active, QPalette::Midlight, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Active, QPalette::Dark, QColor(QRgb(0xff555555))); + palette.setBrush(QPalette::Active, QPalette::Mid, QColor(QRgb(0xffc7c7c7))); + palette.setBrush(QPalette::Active, QPalette::Text, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Active, QPalette::BrightText, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Active, QPalette::ButtonText, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Active, QPalette::Base, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Active, QPalette::AlternateBase, palette.color(QPalette::Active, QPalette::Base).dark(110)); + palette.setBrush(QPalette::Active, QPalette::Window, QColor(QRgb(0xffefefef))); + palette.setBrush(QPalette::Active, QPalette::Shadow, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Active, QPalette::Highlight, QColor(QRgb(0xffdbf756))); // + palette.setBrush(QPalette::Active, QPalette::HighlightedText, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Active, QPalette::Link, QColor(QRgb(0xff0000ee))); + palette.setBrush(QPalette::Active, QPalette::LinkVisited, QColor(QRgb(0xff52188b))); + palette.setBrush(QPalette::Inactive, QPalette::WindowText, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Inactive, QPalette::Button, QColor(QRgb(0xffdddfe4))); //dddfe4 + palette.setBrush(QPalette::Inactive, QPalette::Light, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Inactive, QPalette::Midlight, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Inactive, QPalette::Dark, QColor(QRgb(0xff555555))); + palette.setBrush(QPalette::Inactive, QPalette::Mid, QColor(QRgb(0xffc7c7c7))); + palette.setBrush(QPalette::Inactive, QPalette::Text, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Inactive, QPalette::BrightText, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Inactive, QPalette::ButtonText, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Inactive, QPalette::Base, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Inactive, QPalette::AlternateBase, palette.color(QPalette::Inactive, QPalette::Base).dark(110)); + palette.setBrush(QPalette::Inactive, QPalette::Window, QColor(QRgb(0xffefefef))); + palette.setBrush(QPalette::Inactive, QPalette::Shadow, QColor(QRgb(0xff000000))); + palette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(QRgb(0xffdbf756))); //678db2 + palette.setBrush(QPalette::Inactive, QPalette::HighlightedText, QColor(QRgb(0xffffffff))); + palette.setBrush(QPalette::Inactive, QPalette::Link, QColor(QRgb(0xff0000ee))); + palette.setBrush(QPalette::Inactive, QPalette::LinkVisited, QColor(QRgb(0xff52188b))); + return palette; +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/widgets/EasaierStyle.h Fri May 25 12:36:35 2007 +0000 @@ -0,0 +1,16 @@ + +#ifndef _EASAIER_STYLE_H_ +#define _EASAIER_STYLE_H_ + +#include <QPlastiqueStyle> +#include <QPalette> + +class EasaierStyle : public QPlastiqueStyle{ + Q_OBJECT +public: + QPalette standardPalette() const; + + +}; + +#endif \ No newline at end of file
--- a/widgets/ItemLayerList.cpp Wed May 23 15:11:52 2007 +0000 +++ b/widgets/ItemLayerList.cpp Fri May 25 12:36:35 2007 +0000 @@ -16,41 +16,44 @@ #include "ItemLayerList.h" #include "data/model/LayerItemModel.h" +#include "layer/Layer.h" +#include "base/PlayParameters.h" #include <QWidget> #include <QApplication> #include <QLabel> + ItemLayerList::ItemLayerList(QWidget *parent) : GenericItemList(parent){ setAcceptDrops(true); /* Init all variables*/ - labelIcon = new QLabel; - labelName = new QLabel; - checkBox1 = new QCheckBox; - checkBox2 = new QCheckBox; - layoutMain = new QHBoxLayout; + m_labelIcon = new QLabel; + m_labelName = new QLabel; + m_checkBoxShow = new QCheckBox; + m_checkBoxPlay = new QCheckBox; + m_layoutMain = new QHBoxLayout; /* set the correct widget parameters*/ - labelIcon->setMaximumSize(25,25); + m_labelIcon->setMaximumSize(25,25); //labelIcon->setPixmap(QIcon(":icons/layerViewer_btn_config.png").pixmap(20)); - labelName->setMaximumHeight(25); + m_labelName->setMaximumHeight(25); //labelName->setText("ljdh lksdf hl"); - checkBox1->setLayoutDirection(Qt::RightToLeft); - checkBox1->setMaximumSize(30,30); + m_checkBoxShow->setLayoutDirection(Qt::RightToLeft); + m_checkBoxShow->setMaximumSize(30,30); //checkBox1->setText(""); - checkBox1->setAutoFillBackground(true); + m_checkBoxShow->setAutoFillBackground(true); //QPalette palette; //palette.setColor(QPalette::Button,QColor ( 100, 60, 20)); //checkBox1->setPalette(palette); - checkBox2->setMaximumSize(20,30); + m_checkBoxPlay->setMaximumSize(20,30); - layoutMain->setSpacing(5); - layoutMain->setMargin(0); + m_layoutMain->setSpacing(5); + m_layoutMain->setMargin(0); this->setMaximumHeight(30); this->setMinimumHeight(30); @@ -58,50 +61,49 @@ this->setLineWidth(1); /* build the interface*/ - layoutMain->addWidget(checkBox1); - layoutMain->addWidget(checkBox2); - layoutMain->addWidget(labelIcon); - layoutMain->addWidget(labelName); + m_layoutMain->addWidget(m_checkBoxShow); + m_layoutMain->addWidget(m_checkBoxPlay); + m_layoutMain->addWidget(m_labelIcon); + m_layoutMain->addWidget(m_labelName); /*add the main layout in this widget*/ - this->setLayout(layoutMain); + this->setLayout(m_layoutMain); connect(this, SIGNAL(doubleClicked()), this, SLOT(openPropertyBox())); } void ItemLayerList::setIcon(QString &icon){ - labelIcon->setPixmap(QIcon(icon).pixmap(25)); + m_labelIcon->setPixmap(QIcon(icon).pixmap(25)); } void ItemLayerList::setName(QString &name){ - labelName->setText(name); + m_labelName->setText(name); } void ItemLayerList::setColor(QColor &color){ QPalette palette; palette.setColor(QPalette::Button,color); - checkBox1->setPalette(palette); + m_checkBoxShow->setPalette(palette); } -void ItemLayerList::changeCheckBox1State(bool state){ - checkBox1->setChecked(state); +void ItemLayerList::changeCheckBoxShowState(bool state){ + m_checkBoxShow->setChecked(state); } -void ItemLayerList::changeCheckBox2State(bool state){ - checkBox2->setChecked(state); +void ItemLayerList::changeCheckBoxPlayState(bool state){ + m_checkBoxPlay->setChecked(state); } void ItemLayerList::setPropertyBox(PropertyBox *box){ m_propertyBox = box; if(m_propertyBox!=0){ - connect(checkBox1,SIGNAL(stateChanged(int)),m_propertyBox,SLOT(layerVisibilityChanged(int))); + + m_container = m_propertyBox->container(); + + + updateCheckboxs(); + connect(m_checkBoxShow,SIGNAL(stateChanged(int)),m_propertyBox,SLOT(layerVisibilityChanged(int))); connect(m_propertyBox, SIGNAL(showLayer(bool)), this, SLOT(showLayer(bool))); - if(m_propertyBox->showButton() == 0){ - checkBox1->setEnabled(false); - } - if(m_propertyBox->playButton() ==0 ){ - checkBox2->setEnabled(false); - } } //connect(); @@ -121,13 +123,44 @@ } void ItemLayerList::showLayer(bool value){ - changeCheckBox1State(value); + changeCheckBoxShowState(value); } +void ItemLayerList::updateCheckboxs(){ + Layer *layer = dynamic_cast<Layer *>(m_container); + if (layer) { + m_checkBoxShow->setEnabled(true); + m_checkBoxShow->setChecked(true); + + disconnect(layer, SIGNAL(modelReplaced()), + this, SLOT(updateCheckboxs())); + connect(layer, SIGNAL(modelReplaced()), + this, SLOT(updateCheckboxs())); + }else{ + m_checkBoxShow->setEnabled(false); + } + PlayParameters *params = m_container->getPlayParameters(); + if(params){ + m_checkBoxPlay->setEnabled(true); + m_checkBoxPlay->setChecked(!params->isPlayMuted()); + + connect(params, SIGNAL(playAudibleChanged(bool)),m_checkBoxPlay, SLOT(setState(bool))); + connect(m_checkBoxPlay, SIGNAL(stateChanged(int)),params, SLOT(setPlayAudible(int))); + }else{ + m_checkBoxPlay->setEnabled(false); + } +} + + + + + + +
--- a/widgets/ItemLayerList.h Wed May 23 15:11:52 2007 +0000 +++ b/widgets/ItemLayerList.h Fri May 25 12:36:35 2007 +0000 @@ -32,22 +32,24 @@ void setIcon(QString &icon); void setName(QString &name); void setColor(QColor &color); - void changeCheckBox1State(bool state); - void changeCheckBox2State(bool state); + void changeCheckBoxShowState(bool state); + void changeCheckBoxPlayState(bool state); void setPropertyBox(PropertyBox *box); virtual void configAction(); private: - QLabel *labelIcon; - QLabel *labelName; - QCheckBox *checkBox1; - QCheckBox *checkBox2; - QHBoxLayout *layoutMain; + QLabel *m_labelIcon; + QLabel *m_labelName; + QCheckBox *m_checkBoxShow; + QCheckBox *m_checkBoxPlay; + QHBoxLayout *m_layoutMain; PropertyBox *m_propertyBox; + PropertyContainer *m_container; private slots : void openPropertyBox(); void showLayer(bool value); + void updateCheckboxs(); };
--- a/widgets/PropertyBox.cpp Wed May 23 15:11:52 2007 +0000 +++ b/widgets/PropertyBox.cpp Fri May 25 12:36:35 2007 +0000 @@ -126,6 +126,7 @@ this, SLOT(populateViewPlayFrame())); } + PlayParameters *params = m_container->getPlayParameters(); if (!params && !layer) return; @@ -718,3 +719,7 @@ LEDButton* PropertyBox::playButton(){ return m_playButton; } + +PropertyContainer* PropertyBox::container(){ + return m_container; +}
--- a/widgets/PropertyBox.h Wed May 23 15:11:52 2007 +0000 +++ b/widgets/PropertyBox.h Fri May 25 12:36:35 2007 +0000 @@ -89,6 +89,7 @@ public : LEDButton* showButton(); LEDButton* playButton(); + PropertyContainer* container(); }; #endif
--- a/widgets/svwidgets.vcproj Wed May 23 15:11:52 2007 +0000 +++ b/widgets/svwidgets.vcproj Fri May 25 12:36:35 2007 +0000 @@ -190,6 +190,10 @@ > </File> <File + RelativePath=".\EasaierStyle.cpp" + > + </File> + <File RelativePath=".\ExpandWidget.cpp" > </File> @@ -418,6 +422,21 @@ </FileConfiguration> </File> <File + RelativePath=".\EasaierStyle.h" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="MOC $(InputFileName)" + CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp" + AdditionalDependencies="$(QTDIR)\bin\moc.exe" + Outputs="tmp_moc\moc_$(InputName).cpp" + /> + </FileConfiguration> + </File> + <File RelativePath=".\ExpandWidget.h" > <FileConfiguration @@ -478,7 +497,7 @@ <Tool Name="VCCustomBuildTool" Description="MOC $(InputFileName)" - CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp" + CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp
" AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp_moc\moc_$(InputName).cpp" /> @@ -519,7 +538,7 @@ <Tool Name="VCCustomBuildTool" Description="MOC $(InputFileName)" - CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp" + CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp
" AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp_moc\moc_$(InputName).cpp" /> @@ -560,7 +579,7 @@ <Tool Name="VCCustomBuildTool" Description="MOC $(InputFileName)" - CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp" + CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp
" AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp_moc\moc_$(InputName).cpp" /> @@ -601,7 +620,7 @@ <Tool Name="VCCustomBuildTool" Description="MOC $(InputFileName)" - CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp" + CommandLine="$(QTDIR)\bin\moc.exe -DBUILD_DEBUG -DUSE_VC -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_BZ2 -DHAVE_PORTAUDIO -DHAVE_PORTAUDIO_V18 -DHAVE_OGGZ -DHAVE_FISHSOUND -DHAVE_FFTW3F -DHAVE_VAMP -DHAVE_VAMP_HOSTSDK -DHAVE_SNDFILE -DHAVE_SAMPLERATE -DQT_THREAD_SUPPORT -DQT_DLL -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtCore" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtGui" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include\QtXml" -I "$(QTDIR)\include" -I "." -I ".." -I "$(QTDIR)\include\ActiveQt" -I "tmp_moc" -I "." -I"$(QTDIR)\mkspecs\win32-msvc2005" $(InputPath) -o tmp_moc\moc_$(InputName).cpp
" AdditionalDependencies="$(QTDIR)\bin\moc.exe" Outputs="tmp_moc\moc_$(InputName).cpp" /> @@ -1150,6 +1169,10 @@ > </File> <File + RelativePath=".\tmp_moc\moc_EasaierStyle.cpp" + > + </File> + <File RelativePath=".\tmp_moc\moc_ExpandWidget.cpp" > </File>