[Traverso-commit] traverso/src/traverso PluginSelectorDialog.cpp ...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/27 12:17:29

Modified files:
        src/traverso   : PluginSelectorDialog.cpp PluginSelectorDialog.h 
                         traverso.pro 

Log message:
        get around a cyclic dependency issue...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/PluginSelectorDialog.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/PluginSelectorDialog.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.56&r2=1.57

Patches:
Index: PluginSelectorDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/PluginSelectorDialog.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- PluginSelectorDialog.cpp    11 Jun 2007 13:24:53 -0000      1.14
+++ PluginSelectorDialog.cpp    27 Jun 2007 12:17:28 -0000      1.15
@@ -20,7 +20,6 @@
 */
 
 #include "PluginSelectorDialog.h"
-#include "ui_PluginSelectorDialog.h"
 
 #include <QHeaderView>
 

Index: PluginSelectorDialog.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/PluginSelectorDialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PluginSelectorDialog.h      26 Apr 2007 18:57:57 -0000      1.3
+++ PluginSelectorDialog.h      27 Jun 2007 12:17:29 -0000      1.4
@@ -22,12 +22,20 @@
 #ifndef PLUGIN_SELECTOR_DIALOG_H
 #define PLUGIN_SELECTOR_DIALOG_H
 
-#include "ui_PluginSelectorDialog.h"
 #include <QDialog>
 
+#include <QtGui/QApplication>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+
+
 class Plugin;
 
-class PluginSelectorDialog : public QDialog, protected Ui::PluginSelectorDialog
+class PluginSelectorDialog : public QDialog
 {
        Q_OBJECT
 
@@ -44,8 +52,85 @@
        
        static PluginSelectorDialog* m_instance;
        
+       QVBoxLayout *vboxLayout;
+       QLabel *objectToAddPluginTooLabel;
+       QTreeWidget *pluginTreeWidget;
+       QHBoxLayout *hboxLayout;
+       QSpacerItem *spacerItem;
+       QPushButton *okButton;
+       QPushButton *cancelButton;
+       
        Plugin* m_plugin;
 
+       void setupUi(QDialog *PluginSelectorDialog)
+       {
+               if (PluginSelectorDialog->objectName().isEmpty())
+                       
PluginSelectorDialog->setObjectName(QString::fromUtf8("PluginSelectorDialog"));
+               QSize size(471, 433);
+               size = size.expandedTo(PluginSelectorDialog->minimumSizeHint());
+               PluginSelectorDialog->resize(size);
+               vboxLayout = new QVBoxLayout(PluginSelectorDialog);
+#ifndef Q_OS_MAC
+               vboxLayout->setSpacing(6);
+#endif
+#ifndef Q_OS_MAC
+               vboxLayout->setMargin(9);
+#endif
+               vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+               objectToAddPluginTooLabel = new QLabel(PluginSelectorDialog);
+               
objectToAddPluginTooLabel->setObjectName(QString::fromUtf8("objectToAddPluginTooLabel"));
+
+               vboxLayout->addWidget(objectToAddPluginTooLabel);
+
+               pluginTreeWidget = new QTreeWidget(PluginSelectorDialog);
+               
pluginTreeWidget->setObjectName(QString::fromUtf8("pluginTreeWidget"));
+
+               vboxLayout->addWidget(pluginTreeWidget);
+
+               hboxLayout = new QHBoxLayout();
+#ifndef Q_OS_MAC
+               hboxLayout->setSpacing(6);
+#endif
+               hboxLayout->setMargin(0);
+               hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+               spacerItem = new QSpacerItem(131, 31, QSizePolicy::Expanding, 
QSizePolicy::Minimum);
+
+               hboxLayout->addItem(spacerItem);
+
+               okButton = new QPushButton(PluginSelectorDialog);
+               okButton->setObjectName(QString::fromUtf8("okButton"));
+
+               hboxLayout->addWidget(okButton);
+
+               cancelButton = new QPushButton(PluginSelectorDialog);
+               cancelButton->setObjectName(QString::fromUtf8("cancelButton"));
+
+               hboxLayout->addWidget(cancelButton);
+
+
+               vboxLayout->addLayout(hboxLayout);
+
+
+               retranslateUi(PluginSelectorDialog);
+               QObject::connect(cancelButton, SIGNAL(clicked()), 
PluginSelectorDialog, SLOT(reject()));
+               QObject::connect(okButton, SIGNAL(clicked()), 
PluginSelectorDialog, SLOT(accept()));
+               QObject::connect(pluginTreeWidget, 
SIGNAL(activated(QModelIndex)), okButton, SLOT(click()));
+
+               QMetaObject::connectSlotsByName(PluginSelectorDialog);
+       } // setupUi
+
+       void retranslateUi(QDialog *PluginSelectorDialog)
+       {
+               
PluginSelectorDialog->setWindowTitle(QApplication::translate("PluginSelectorDialog",
 "Plugin Selector", 0, QApplication::UnicodeUTF8));
+               
objectToAddPluginTooLabel->setText(QApplication::translate("PluginSelectorDialog",
 "Add Plugin too", 0, QApplication::UnicodeUTF8));
+               pluginTreeWidget->headerItem()->setText(0, 
QApplication::translate("PluginSelectorDialog", "Plugin Name", 0, 
QApplication::UnicodeUTF8));
+               pluginTreeWidget->headerItem()->setText(1, 
QApplication::translate("PluginSelectorDialog", "Type", 0, 
QApplication::UnicodeUTF8));
+               pluginTreeWidget->headerItem()->setText(2, 
QApplication::translate("PluginSelectorDialog", "In/Out", 0, 
QApplication::UnicodeUTF8));
+               
okButton->setText(QApplication::translate("PluginSelectorDialog", "OK", 0, 
QApplication::UnicodeUTF8));
+               
cancelButton->setText(QApplication::translate("PluginSelectorDialog", "Cancel", 
0, QApplication::UnicodeUTF8));
+               Q_UNUSED(PluginSelectorDialog);
+       } // retranslateUi
+       
 private slots:
        void on_okButton_clicked();
        void on_cancelButton_clicked();

Index: traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- traverso.pro        22 Jun 2007 12:29:28 -0000      1.56
+++ traverso.pro        27 Jun 2007 12:17:29 -0000      1.57
@@ -82,7 +82,7 @@
        widgets/ResourcesWidget.cpp
 FORMS += ui/ExportWidget.ui \
        ui/AudioSourcesManagerWidget.ui \
-       ui/PluginSelectorDialog.ui \
+#      ui/PluginSelectorDialog.ui \
        ui/SpectralMeterConfigWidget.ui \
        ui/QuickDriverConfigWidget.ui \
        ui/DriverConfigPage.ui \