aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimization tape config dialog for Mac OS.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-12-02 17:05:30 +02:00
parent 9f3e41a6f6
commit 8506afc056
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/tape/dialogs/configpages/tapeconfigurationpage.cpp
View File

@ -120,8 +120,7 @@ void TapeConfigurationPage::SystemChanged()
#else #else
text = qApp->TrVars()->PMSystemBook(systemCombo->currentData().toString()); text = qApp->TrVars()->PMSystemBook(systemCombo->currentData().toString());
#endif #endif
systemBookValueLabel->setText(text); systemBookValueLabel->setPlainText(text);
systemBookValueLabel->setToolTip(text);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -153,7 +152,7 @@ void TapeConfigurationPage::changeEvent(QEvent *event)
QGroupBox *TapeConfigurationPage::LangGroup() QGroupBox *TapeConfigurationPage::LangGroup()
{ {
langGroup = new QGroupBox(tr("Language")); langGroup = new QGroupBox(tr("Language"));
guiLabel = new QLabel(tr("GUI language")); guiLabel = new QLabel(tr("GUI language:"));
langCombo = new QComboBox; langCombo = new QComboBox;
QStringList fileNames; QStringList fileNames;
@ -198,10 +197,11 @@ QGroupBox *TapeConfigurationPage::LangGroup()
&TapeConfigurationPage::LangChanged); &TapeConfigurationPage::LangChanged);
QFormLayout *langLayout = new QFormLayout; QFormLayout *langLayout = new QFormLayout;
langLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
langLayout->addRow(guiLabel, langCombo); langLayout->addRow(guiLabel, langCombo);
//-------------------- Pattern making system //-------------------- Pattern making system
systemLabel = new QLabel(tr("Pattern making system")); systemLabel = new QLabel(tr("Pattern making system:"));
systemCombo = new QComboBox; systemCombo = new QComboBox;
InitPMSystems(systemCombo); InitPMSystems(systemCombo);
@ -216,8 +216,9 @@ QGroupBox *TapeConfigurationPage::LangGroup()
//---- //----
systemBookLabel = new QLabel(tr("Book:")); systemBookLabel = new QLabel(tr("Book:"));
systemBookValueLabel = new QLabel(""); systemBookValueLabel = new QPlainTextEdit("");
systemBookValueLabel->setWordWrap(true); systemBookValueLabel->setReadOnly(true);
systemBookValueLabel->setFixedHeight(4 * QFontMetrics(systemBookValueLabel->font()).lineSpacing());
langLayout->addRow(systemBookLabel, systemBookValueLabel); langLayout->addRow(systemBookLabel, systemBookValueLabel);
@ -232,7 +233,7 @@ QGroupBox *TapeConfigurationPage::LangGroup()
} }
//-------------------- Decimal separator setup //-------------------- Decimal separator setup
separatorLabel = new QLabel(tr("Decimal separator parts")); separatorLabel = new QLabel(tr("Decimal separator parts:"));
osOptionCheck = new QCheckBox(tr("With OS options (%1)").arg(QLocale::system().decimalPoint().toLatin1())); osOptionCheck = new QCheckBox(tr("With OS options (%1)").arg(QLocale::system().decimalPoint().toLatin1()));
osOptionCheck->setChecked(settings->GetOsSeparator()); osOptionCheck->setChecked(settings->GetOsSeparator());
@ -283,8 +284,7 @@ void TapeConfigurationPage::RetranslateUi()
#else #else
text = qApp->TrVars()->PMSystemBook(systemCombo->currentData().toString()); text = qApp->TrVars()->PMSystemBook(systemCombo->currentData().toString());
#endif #endif
systemBookValueLabel->setText(text); systemBookValueLabel->setPlainText(text);
systemBookValueLabel->setToolTip(text);
separatorLabel->setText(tr("Decimal separator parts")); separatorLabel->setText(tr("Decimal separator parts"));
osOptionCheck = new QCheckBox(tr("With OS options (%1)").arg(QLocale::system().decimalPoint().toLatin1())); osOptionCheck = new QCheckBox(tr("With OS options (%1)").arg(QLocale::system().decimalPoint().toLatin1()));

3
src/app/tape/dialogs/configpages/tapeconfigurationpage.h
View File

@ -30,6 +30,7 @@
#define CONFIGURATIONPAGE_H #define CONFIGURATIONPAGE_H
#include <QObject> #include <QObject>
#include <QPlainTextEdit>
#include <QWidget> #include <QWidget>
class QCheckBox; class QCheckBox;
@ -66,7 +67,7 @@ private:
QCheckBox *askPointDeletionCheck; QCheckBox *askPointDeletionCheck;
QCheckBox *toolBarStyleCheck; QCheckBox *toolBarStyleCheck;
QLabel *systemAuthorValueLabel; QLabel *systemAuthorValueLabel;
QLabel *systemBookValueLabel; QPlainTextEdit *systemBookValueLabel;
QGroupBox *langGroup; QGroupBox *langGroup;
QLabel *guiLabel; QLabel *guiLabel;