From 1fb16888d9ee3def280a95b12c6b8cdac6ffa9c8 Mon Sep 17 00:00:00 2001 From: Adeel Asghar Date: Thu, 22 Sep 2011 16:38:06 +0000 Subject: [PATCH] - Some editing of dialogs. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9903 f25d12d1-65f4-0310-ae8a-bbce733d8d8e --- OMEdit/OMEditGUI/ConnectorWidget.cpp | 34 ++++++++---- OMEdit/OMEditGUI/ConnectorWidget.h | 2 + OMEdit/OMEditGUI/TextAnnotation.cpp | 77 ++++++++++++++-------------- OMEdit/OMEditGUI/TextAnnotation.h | 41 +++++++-------- 4 files changed, 82 insertions(+), 72 deletions(-) diff --git a/OMEdit/OMEditGUI/ConnectorWidget.cpp b/OMEdit/OMEditGUI/ConnectorWidget.cpp index 8494e8081aa..b0942d6db1c 100644 --- a/OMEdit/OMEditGUI/ConnectorWidget.cpp +++ b/OMEdit/OMEditGUI/ConnectorWidget.cpp @@ -723,7 +723,19 @@ ConnectorArrayMenu::ConnectorArrayMenu(Connector *pConnector,QWidget *pParent) { mpConnector = pConnector; setMinimumSize(375, 140); - //setModal(true); + setModal(true); + + // heading + mpHeading = new QLabel(tr("Connection")); + mpHeading->setFont(QFont("", Helper::headingFontSize)); + mpHeading->setAlignment(Qt::AlignTop); + + QHBoxLayout *horizontalLayout = new QHBoxLayout; + horizontalLayout->addWidget(mpHeading); + + mHorizontalLine = new QFrame(); + mHorizontalLine->setFrameShape(QFrame::HLine); + mHorizontalLine->setFrameShadow(QFrame::Sunken); // Create the Text Box, File Dialog and Labels mpLabel= new QLabel; @@ -748,12 +760,14 @@ ConnectorArrayMenu::ConnectorArrayMenu(Connector *pConnector,QWidget *pParent) // Create a layout QGridLayout *mainLayout = new QGridLayout; - mainLayout->addWidget(mpLabel, 0, 0); - mainLayout->addWidget(mpStartIndexLabel, 1, 0); - mainLayout->addWidget(mpStartIndexTextBox, 2, 0); - mainLayout->addWidget(mpEndIndexLabel, 3, 0); - mainLayout->addWidget(mpEndIndexTextBox, 4, 0); - mainLayout->addWidget(mpButtonBox, 5, 0); + mainLayout->addLayout(horizontalLayout, 0, 0); + mainLayout->addWidget(mHorizontalLine, 1, 0); + mainLayout->addWidget(mpLabel, 2, 0); + mainLayout->addWidget(mpStartIndexLabel, 3, 0); + mainLayout->addWidget(mpStartIndexTextBox, 4, 0); + mainLayout->addWidget(mpEndIndexLabel, 5, 0); + mainLayout->addWidget(mpEndIndexTextBox, 6, 0); + mainLayout->addWidget(mpButtonBox, 7, 0); setLayout(mainLayout); } @@ -765,7 +779,7 @@ ConnectorArrayMenu::~ConnectorArrayMenu() //displays the array menu for adding indices incase either one is a connector array. void ConnectorArrayMenu::show() { - setWindowTitle(QString(Helper::applicationName).append(" - Connector Array Menu ")); + setWindowTitle(QString(Helper::applicationName).append(" - Connection")); Component *pEndComponent = this->mpConnector->getEndComponent(); Component *pStartComponent = this->mpConnector->getStartComponent(); @@ -792,7 +806,7 @@ void ConnectorArrayMenu::show() //if start port is a connector array if(this->mpConnector->getStartConnectorisArray()) { - mpStartIndexLabel->setText(" Enter Index in the Array For Start Component :"); + mpStartIndexLabel->setText("Enter index in the array for Start Component:"); mpStartIndexTextBox->setText(tr("")); mpStartIndexTextBox->setFocus(); mStartArrayExist = true; @@ -807,7 +821,7 @@ void ConnectorArrayMenu::show() //if end port is a connector array if(this->mpConnector->getEndConnectorisArray()) { - mpEndIndexLabel->setText(" Enter Index in the Array For End Component :"); + mpEndIndexLabel->setText("Enter index in the array for End Component:"); mpEndIndexTextBox->setText(tr("")); mEndArrayExist = true; endIconCompName.append("[ j ]"); diff --git a/OMEdit/OMEditGUI/ConnectorWidget.h b/OMEdit/OMEditGUI/ConnectorWidget.h index d60f66da266..0c0129591d2 100644 --- a/OMEdit/OMEditGUI/ConnectorWidget.h +++ b/OMEdit/OMEditGUI/ConnectorWidget.h @@ -157,6 +157,8 @@ class ConnectorArrayMenu : public QDialog void show(); // void setText(QString text); private: + QLabel *mpHeading; + QFrame *mHorizontalLine; QLabel *mpLabel; QLabel *mpStartIndexLabel; QLabel *mpEndIndexLabel; diff --git a/OMEdit/OMEditGUI/TextAnnotation.cpp b/OMEdit/OMEditGUI/TextAnnotation.cpp index 42432a7146e..de5c89e7bf8 100644 --- a/OMEdit/OMEditGUI/TextAnnotation.cpp +++ b/OMEdit/OMEditGUI/TextAnnotation.cpp @@ -781,7 +781,8 @@ TextWidget::TextWidget(TextAnnotation *pTextShape, MainWindow *parent) { setWindowTitle(QString(Helper::applicationName).append(" - Text Properties")); setAttribute(Qt::WA_DeleteOnClose); - //setMaximumSize(300, 300); + setModal(true); + setMinimumSize(300, 300); mpParentMainWindow = parent; mpTextAnnotation = pTextShape; setUpForm(); @@ -789,28 +790,31 @@ TextWidget::TextWidget(TextAnnotation *pTextShape, MainWindow *parent) void TextWidget::setUpForm() { + // heading + mpHeading = new QLabel(tr("Text Properties")); + mpHeading->setFont(QFont("", Helper::headingFontSize)); + mpHeading->setAlignment(Qt::AlignTop); + + QHBoxLayout *horizontalLayout = new QHBoxLayout; + horizontalLayout->addWidget(mpHeading); + + mHorizontalLine = new QFrame(); + mHorizontalLine->setFrameShape(QFrame::HLine); + mHorizontalLine->setFrameShadow(QFrame::Sunken); + //Text Label - QGridLayout *textLayout = new QGridLayout; - mpTextGroup = new QGroupBox(); mpTextLabel = new QLabel(tr("Text of Label:")); mpTextBox = new QLineEdit(mpTextAnnotation->getTextString()); - textLayout->addWidget(mpTextLabel, 0, 0); - textLayout->addWidget(mpTextBox, 0, 1); - mpTextGroup->setLayout(textLayout); - - //Font Name - QGridLayout *fontLayout = new QGridLayout; - mpFontGroup = new QGroupBox(); - mpFontLabel = new QLabel(tr("Fontname:")); + + //Font Name + mpFontLabel = new QLabel(tr("Font Name:")); mpFontFamilyComboBox = new QFontComboBox; int currentIndex; currentIndex = mpFontFamilyComboBox->findText(mpTextAnnotation->getFontName(), Qt::MatchExactly); mpFontFamilyComboBox->setCurrentIndex(currentIndex); - fontLayout->addWidget(mpFontLabel, 0, 0); - fontLayout->addWidget(mpFontFamilyComboBox, 0, 1); - mpFontGroup->setLayout(fontLayout); //Font Size + mpFontSizeLabel = new QLabel(tr("Font Size:")); mpFontSizeComboBox = new QComboBox; QStringList sizesList; sizesList << "0" << "2" << "4"; @@ -818,40 +822,29 @@ void TextWidget::setUpForm() mpFontSizeComboBox->addItems(Helper::fontSizes.split(",")); currentIndex = mpFontSizeComboBox->findText(QString::number(mpTextAnnotation->getFontSize()), Qt::MatchExactly); mpFontSizeComboBox->setCurrentIndex(currentIndex); - QGridLayout *fontSizeLayout = new QGridLayout; - mpFontSizeGroup = new QGroupBox(); - mpFontSizeLabel = new QLabel(tr("Fontsize:")); - fontSizeLayout->addWidget(mpFontSizeLabel, 0, 0); - fontSizeLayout->addWidget(mpFontSizeComboBox, 0, 1, Qt::AlignLeft); - mpFontSizeGroup->setLayout(fontSizeLayout); //Cursive Bold Underline Checkboxes - QGridLayout *styleLayout = new QGridLayout; - mpStyleGroup = new QGroupBox(); mpCursive = new QCheckBox("Italic", this); mpCursive->setChecked(mpTextAnnotation->getItalic()); mpBold = new QCheckBox("Bold", this); mpBold->setChecked(mpTextAnnotation->getWeight()); mpUnderline = new QCheckBox("Underline", this); mpUnderline->setChecked(mpTextAnnotation->getUnderLine()); - styleLayout->addWidget(mpCursive, 0, 1); - styleLayout->addWidget(mpBold, 0, 2); - styleLayout->addWidget(mpUnderline, 0, 3); - mpStyleGroup->setLayout(styleLayout); + mpStylesGroup = new QGroupBox(tr("Styles")); + QVBoxLayout *verticalPropertiesLayout = new QVBoxLayout; + verticalPropertiesLayout->addWidget(mpCursive); + verticalPropertiesLayout->addWidget(mpBold); + verticalPropertiesLayout->addWidget(mpUnderline); + mpStylesGroup->setLayout(verticalPropertiesLayout); //Alignment + mpAlignmentLabel = new QLabel(tr("Alignment:")); mpAlignmentComboBox = new QComboBox; QStringList alignmentList; alignmentList << Helper::left << Helper::center << Helper::right; mpAlignmentComboBox->addItems(alignmentList); currentIndex = mpAlignmentComboBox->findText(mpTextAnnotation->getAlignment(), Qt::MatchExactly); mpAlignmentComboBox->setCurrentIndex(currentIndex); - QGridLayout *alignmentLayout = new QGridLayout; - mpAlignmentGroup = new QGroupBox(); - mpAlignmentLabel = new QLabel(tr("Alignment:")); - alignmentLayout->addWidget(mpAlignmentLabel, 0, 0); - alignmentLayout->addWidget(mpAlignmentComboBox, 0, 1, Qt::AlignLeft); - mpAlignmentGroup->setLayout(alignmentLayout); //Buttons mpEditButton = new QPushButton(tr("Ok")); @@ -864,14 +857,20 @@ void TextWidget::setUpForm() mpButtonBox->addButton(mpEditButton, QDialogButtonBox::ActionRole); mpButtonBox->addButton(mpCancelButton, QDialogButtonBox::ActionRole); - //Main Layout + // Create a layout QGridLayout *mainLayout = new QGridLayout; - mainLayout->addWidget(mpTextGroup, 1, 0); - mainLayout->addWidget(mpFontGroup, 2, 0); - mainLayout->addWidget(mpFontSizeGroup, 3, 0); - mainLayout->addWidget(mpStyleGroup, 4, 0); - mainLayout->addWidget(mpAlignmentGroup, 5, 0); - mainLayout->addWidget(mpButtonBox, 6, 0); + mainLayout->addLayout(horizontalLayout, 0, 0, 1, 2); + mainLayout->addWidget(mHorizontalLine, 1, 0, 1, 2); + mainLayout->addWidget(mpTextLabel, 2, 0); + mainLayout->addWidget(mpTextBox, 2, 1); + mainLayout->addWidget(mpFontLabel, 3, 0); + mainLayout->addWidget(mpFontFamilyComboBox, 3, 1); + mainLayout->addWidget(mpFontSizeLabel, 4, 0); + mainLayout->addWidget(mpFontSizeComboBox, 4, 1); + mainLayout->addWidget(mpStylesGroup, 5, 0, 1, 2); + mainLayout->addWidget(mpAlignmentLabel, 6, 0); + mainLayout->addWidget(mpAlignmentComboBox, 6, 1); + mainLayout->addWidget(mpButtonBox, 7, 0, 1, 2); setLayout(mainLayout); } diff --git a/OMEdit/OMEditGUI/TextAnnotation.h b/OMEdit/OMEditGUI/TextAnnotation.h index 9c82c714e11..9c4c1dca60d 100644 --- a/OMEdit/OMEditGUI/TextAnnotation.h +++ b/OMEdit/OMEditGUI/TextAnnotation.h @@ -111,30 +111,25 @@ class TextWidget : public QDialog void show(); private: - QLabel *mpTextLabel; - QLineEdit *mpTextBox; - QLabel *mpFontLabel; - QLabel *mpFontSizeLabel; - QPushButton *mpEditButton; - QPushButton *mpCancelButton; - QDialogButtonBox *mpButtonBox; - QGroupBox *mpTextGroup; - QGroupBox *mpFontGroup; - QGroupBox *mpFontSizeGroup; + QLabel *mpHeading; + QFrame *mHorizontalLine; + QLabel *mpTextLabel; + QLineEdit *mpTextBox; + QLabel *mpFontLabel; + QFontComboBox *mpFontFamilyComboBox; + QLabel *mpFontSizeLabel; + QComboBox *mpFontSizeComboBox; + QLabel *mpAlignmentLabel; + QComboBox *mpAlignmentComboBox; + QGroupBox *mpStylesGroup; + QCheckBox *mpCursive; + QCheckBox *mpBold; + QCheckBox *mpUnderline; + QPushButton *mpEditButton; + QPushButton *mpCancelButton; + QDialogButtonBox *mpButtonBox; - QCheckBox *mpCursive; - QCheckBox *mpBold; - QCheckBox *mpUnderline; - QGroupBox *mpStyleGroup; - - QFontComboBox *mpFontFamilyComboBox; - QComboBox *mpFontSizeComboBox; - - QComboBox *mpAlignmentComboBox; - QGroupBox *mpAlignmentGroup; - QLabel *mpAlignmentLabel; - - TextAnnotation *mpTextAnnotation; + TextAnnotation *mpTextAnnotation; public slots: void edit(); };