[Lprof-devel] lprof/src/libqtlcmswidgets qtlcmswidgets.cpp, 1.42.2.1, 1.42.2.2 qtlcmswidgets.h, 1.1
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/libqtlcmswidgets qtlcmswidgets.cpp, 1.42.2.1, 1.42.2.2 qtlcmswidgets.h, 1.15.2.1, 1.15.2.2
|
From: Amit K. <ami...@us...> - 2009-06-16 07:26:30
|
Update of /cvsroot/lprof/lprof/src/libqtlcmswidgets In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20776/lprof/src/libqtlcmswidgets Modified Files: Tag: GSoC-2009 qtlcmswidgets.cpp qtlcmswidgets.h Log Message: Index: qtlcmswidgets.h =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.h,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -C2 -d -r1.15.2.1 -r1.15.2.2 *** qtlcmswidgets.h 10 Jun 2009 19:38:08 -0000 1.15.2.1 --- qtlcmswidgets.h 16 Jun 2009 07:26:25 -0000 1.15.2.2 *************** *** 36,48 **** #define __qtlcmswidgets_H - #include <q3hbox.h> #include <QLabel> #include <QComboBox> #include <QPushButton> - #include <q3table.h> #include <QLineEdit> #include <QPainter> #include <QWidget> #include "lcmsprf.h" // Base selector implements a selector for IT8 files and icc profiles --- 36,52 ---- #define __qtlcmswidgets_H #include <QLabel> #include <QComboBox> #include <QPushButton> #include <QLineEdit> #include <QPainter> #include <QWidget> #include "lcmsprf.h" + #include <QHBoxLayout> + #include <QTableView> + #include <QTableWidget> + + #include <q3hbox.h> + #include <q3table.h> // Base selector implements a selector for IT8 files and icc profiles *************** *** 50,129 **** // It has bed designed to never be extended anymore - // changed by me =========================================================================== - /* - class BaseSelector: public Q3HBox { - - - Q_OBJECT - Q_PROPERTY(QString FileMask READ ReadFileMask WRITE WriteFileMask); - Q_PROPERTY(QString Dir READ ReadDir WRITE WriteDir); - Q_PROPERTY(QString Prompt READ getPrompt WRITE setPrompt); - Q_PROPERTY(int lUseDescriptor READ getUseDescriptor WRITE setUseDescriptor); - Q_PROPERTY(int lForOutput READ getForOutput WRITE setForOutput);; - - public: - - BaseSelector(QString ThePrompt, QString DefaultDir, QString Mask = "*.*", BOOL lUseLineEdit = FALSE, BOOL showFileDialog = TRUE, - QWidget* parent=0, const char* name=0, Qt::WFlags f=0); - - QString getFilename() const; - void setFilename(const QString name); - - QString getPrompt() const { return Prompt->text(); } - void setPrompt(QString text) { Prompt->setText(text); } - - - QString ReadFileMask() const { return FileMask; } - void WriteFileMask(QString Mask) { FileMask = Mask; } - - QString ReadDir() const { return Dir; } - void WriteDir(QString TheDir) { Dir= TheDir; } - - void setCurrItem(int n) { Combo->setCurrentItem(n); } - int getCurrItem() { return Combo->currentItem(); } - int count() {return Combo->count();} - - void setUseDescriptor(int n) { lUseDescriptor = n; } - int getUseDescriptor() const { return lUseDescriptor; } - - void setForOutput(int n) { lUseDescriptor = n; } - int getForOutput() const { return lUseDescriptor; } - - - void setDirCaption(QString text) { PickButton->setText(text); } - - - QString Dir; - QString FileMask; - int lUseDescriptor; - int lUseLineEdit; - int lForOutput; - - virtual void FillValues() = 0; - - protected: - - QStringList Descriptions, FileNames; - QLabel* Prompt; - QComboBox* Combo; - QLineEdit* LineEdit; - QPushButton* PickButton; - - QPushButton* NewButtonPtr; - - protected slots: - - void slotButtonClicked(); - void slotValueChanged(); - - signals: - - void valueChanged(); - - - }; - */ - - class BaseSelector: public QWidget { --- 54,57 ---- *************** *** 154,159 **** void WriteDir(QString TheDir) { Dir= TheDir; } ! void setCurrItem(int n) { Combo->setCurrentItem(n); } ! int getCurrItem() { return Combo->currentItem(); } int count() {return Combo->count();} --- 82,87 ---- void WriteDir(QString TheDir) { Dir= TheDir; } ! void setCurrItem(int n) { Combo->setCurrentIndex(n); } ! int getCurrItem() { return Combo->currentIndex(); } int count() {return Combo->count();} *************** *** 199,209 **** - - - //=================================================================== - - - - // Selects a IT8/CGATS.5 file using a combo box --- 127,130 ---- Index: qtlcmswidgets.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.cpp,v retrieving revision 1.42.2.1 retrieving revision 1.42.2.2 diff -C2 -d -r1.42.2.1 -r1.42.2.2 *** qtlcmswidgets.cpp 10 Jun 2009 19:38:08 -0000 1.42.2.1 --- qtlcmswidgets.cpp 16 Jun 2009 07:26:25 -0000 1.42.2.2 *************** *** 76,129 **** // A selector widget - - //removed by me ============================================================= - /* - BaseSelector::BaseSelector(QString ThePrompt, QString DefaultDir, - QString Mask, BOOL lLineEdit, BOOL showFileDialog, - QWidget* parent, const char* name, Qt::WFlags f) : - Q3HBox(parent, name, f), - Dir(DefaultDir), - FileMask(Mask), - lUseDescriptor(0), - lUseLineEdit(lLineEdit) - { - lForOutput = FALSE; - Prompt = new QLabel(ThePrompt, this); - Prompt->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - Prompt->setSizePolicy(QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred)); - - if (lUseLineEdit) - { - LineEdit = new QLineEdit(this); - Prompt->setBuddy(LineEdit); - Combo = NULL; - } - else - { - Combo = new QComboBox(FALSE, this), - Combo->setEditable(FALSE); - Combo-> setSizePolicy(QSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred)); - Prompt->setBuddy(Combo); - LineEdit = NULL; - } - - setMargin(2); - setSpacing(10); - if (showFileDialog) - { - PickButton = new QPushButton(this); - PickButton -> setSizePolicy(QSizePolicy (QSizePolicy::Minimum, QSizePolicy::Preferred)); - PickButton-> setText(tr (" Select Directory ")); - NewButtonPtr = NULL; - connect(PickButton, SIGNAL( clicked() ), this, SLOT( slotButtonClicked() ) ); - } - - if (lUseLineEdit) - connect( LineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( slotValueChanged() ) ); - else - connect( Combo, SIGNAL( activated(int) ), this, SLOT( slotValueChanged() ) ); - } - */ - BaseSelector::BaseSelector(QString ThePrompt, QString DefaultDir, QString Mask, BOOL lLineEdit, BOOL showFileDialog, --- 76,79 ---- *************** *** 135,140 **** lUseLineEdit(lLineEdit) { - //added ========================================== - //now on when we want to add any widget we will add to layout_baseselector instead to this. setAccessibleName(QString(QLatin1String(name))); QHBoxLayout *layout_baseselector = new QHBoxLayout; --- 85,88 ---- *************** *** 142,151 **** layout_baseselector->setContentsMargins(2,2,2,2); this->setLayout(layout_baseselector); - //=============================================== lForOutput = FALSE; ! //Prompt = new QLabel(ThePrompt, this); ! Prompt=new QLabel(ThePrompt); //added=== ! this->layout()->addWidget(Prompt); //added=== Prompt->setAlignment(Qt::AlignRight|Qt::AlignVCenter); Prompt->setSizePolicy(QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred)); --- 90,97 ---- layout_baseselector->setContentsMargins(2,2,2,2); this->setLayout(layout_baseselector); lForOutput = FALSE; ! Prompt=new QLabel(ThePrompt); ! this->layout()->addWidget(Prompt); Prompt->setAlignment(Qt::AlignRight|Qt::AlignVCenter); Prompt->setSizePolicy(QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred)); *************** *** 153,159 **** if (lUseLineEdit) { ! // LineEdit = new QLineEdit(this); ! LineEdit = new QLineEdit(); //added=== ! this->layout()->addWidget(LineEdit); //added=== Prompt->setBuddy(LineEdit); Combo = NULL; --- 99,104 ---- if (lUseLineEdit) { ! LineEdit = new QLineEdit(); ! this->layout()->addWidget(LineEdit); Prompt->setBuddy(LineEdit); Combo = NULL; *************** *** 161,167 **** else { ! // Combo = new QComboBox(FALSE, this), ! Combo =new QComboBox(FALSE); //added=== ! this->layout()->addWidget(Combo); //added=== Combo->setEditable(FALSE); Combo-> setSizePolicy(QSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred)); --- 106,111 ---- else { ! Combo =new QComboBox(FALSE); ! this->layout()->addWidget(Combo); Combo->setEditable(FALSE); Combo-> setSizePolicy(QSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred)); *************** *** 170,180 **** } - //setMargin(2); //implemented this when created layout - //setSpacing(10); if (showFileDialog) { ! //PickButton = new QPushButton(this); ! PickButton = new QPushButton(); //added=== ! this->layout()->addWidget(PickButton); //added=== PickButton -> setSizePolicy(QSizePolicy (QSizePolicy::Minimum, QSizePolicy::Preferred)); --- 114,121 ---- } if (showFileDialog) { ! PickButton = new QPushButton(); ! this->layout()->addWidget(PickButton); PickButton -> setSizePolicy(QSizePolicy (QSizePolicy::Minimum, QSizePolicy::Preferred)); *************** *** 190,198 **** } - //=================================================================== - - - - QString BaseSelector::getFilename() const --- 131,134 ---- |
