kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the button to choose the standard font used for text fields (those which are added on folio)

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5175 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
nuri
2017-12-12 06:52:44 +00:00
parent 60617b28cd
commit 333e3345bc
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sources/configpages.cpp
View File

@@ -29,6 +29,7 @@
#include "qetapp.h" #include "qetapp.h"
#include <QFontDialog> #include <QFontDialog>
#include <QFont> #include <QFont>
#include <QSizePolicy>
/** /**
* @brief NewDiagramPage::NewDiagramPage * @brief NewDiagramPage::NewDiagramPage
@@ -253,8 +254,13 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
terminal_exportlist_ = new QCheckBox(tr("Exporter les bornes dans la nomenclature"), projects_view_mode_); terminal_exportlist_ = new QCheckBox(tr("Exporter les bornes dans la nomenclature"), projects_view_mode_);
m_zoom_out_beyond_folio = new QCheckBox(tr("Autoriser le dézoom au delà du folio"), this); m_zoom_out_beyond_folio = new QCheckBox(tr("Autoriser le dézoom au delà du folio"), this);
QPushButton *fontButton = new QPushButton(tr("Choix de la police de texte utilisée pour les textes independants")); QString fontInfos = settings.value("diagramitemfont").toString() + " " +
settings.value("diagramitemsize").toString() + " (" +
settings.value("diagramitemweight").toString() + ", " +
settings.value("diagramitemfont").toString() + ")";
font_label = new QLabel(tr("Police des champs de texte"));
fontButton = new QPushButton(fontInfos);
fontButton->setMinimumHeight(28);
elements_management_ = new QGroupBox(tr("Gestion des éléments"), this); elements_management_ = new QGroupBox(tr("Gestion des éléments"), this);
highlight_integrated_elements_ = new QCheckBox(tr("Mettre en valeur dans le panel les éléments fraîchement intégrés", "configuration option")); highlight_integrated_elements_ = new QCheckBox(tr("Mettre en valeur dans le panel les éléments fraîchement intégrés", "configuration option"));
@@ -291,16 +297,21 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
appearance_ -> setLayout(appearance_layout); appearance_ -> setLayout(appearance_layout);
QVBoxLayout *projects_view_mode_layout = new QVBoxLayout; QVBoxLayout *projects_view_mode_layout = new QVBoxLayout;
projects_view_mode_layout -> addWidget(windowed_mode_); QHBoxLayout *font_view_layout = new QHBoxLayout;
projects_view_mode_layout -> addWidget(windowed_mode_);
projects_view_mode_layout -> addWidget(tabbed_mode_); projects_view_mode_layout -> addWidget(tabbed_mode_);
projects_view_mode_layout -> addWidget(m_zoom_out_beyond_folio); projects_view_mode_layout -> addWidget(m_zoom_out_beyond_folio);
projects_view_mode_layout -> addWidget(use_trackpad_); projects_view_mode_layout -> addWidget(use_trackpad_);
projects_view_mode_layout -> addWidget(save_label_paste_); projects_view_mode_layout -> addWidget(save_label_paste_);
projects_view_mode_layout -> addWidget(folio_panel_); projects_view_mode_layout -> addWidget(folio_panel_);
projects_view_mode_layout -> addWidget(terminal_exportlist_); projects_view_mode_layout -> addWidget(terminal_exportlist_);
projects_view_mode_layout-> addWidget(fontButton, 0, 0); font_view_layout->addWidget(font_label, 1);
connect(fontButton, SIGNAL(clicked()), this, SLOT(setFont())); font_view_layout->addWidget(fontButton, 0);
projects_view_mode_ -> setLayout(projects_view_mode_layout); projects_view_mode_layout-> addLayout(font_view_layout);
projects_view_mode_ -> setLayout(projects_view_mode_layout);
connect(fontButton, SIGNAL(clicked()), this, SLOT(setFont()));
QVBoxLayout *elements_management_layout = new QVBoxLayout(); QVBoxLayout *elements_management_layout = new QVBoxLayout();
elements_management_layout -> addWidget(highlight_integrated_elements_); elements_management_layout -> addWidget(highlight_integrated_elements_);
@@ -407,7 +418,7 @@ void GeneralConfigurationPage::fillLang(QSettings &settings) {
lang_combo_box->addItem(QET::Icons::nl, tr("Pays-Bas"), "nl"); lang_combo_box->addItem(QET::Icons::nl, tr("Pays-Bas"), "nl");
lang_combo_box->addItem(QET::Icons::be, tr("Belgique-Flemish"), "be"); lang_combo_box->addItem(QET::Icons::be, tr("Belgique-Flemish"), "be");
//set curent index to the lang found in setting file //set current index to the lang found in setting file
//if lang doesn't exist set to system //if lang doesn't exist set to system
for (int i=0; i<lang_combo_box->count(); i++) { for (int i=0; i<lang_combo_box->count(); i++) {
if (lang_combo_box->itemData(i).toString() == settings.value("lang").toString()) { if (lang_combo_box->itemData(i).toString() == settings.value("lang").toString()) {
@@ -527,13 +538,18 @@ QString PrintConfigPage::title() const {
void GeneralConfigurationPage::setFont() void GeneralConfigurationPage::setFont()
{ {
bool ok; bool ok;
QSettings settings; QSettings settings;
QFont font = QFontDialog::getFont(&ok, QFont(), this); QFont font = QFontDialog::getFont(&ok, QFont(), this);
if (ok) { if (ok) {
settings.setValue("diagramitemfont", font.family()); settings.setValue("diagramitemfont", font.family());
settings.setValue("diagramitemsize", font.pointSize()); settings.setValue("diagramitemsize", font.pointSize());
settings.setValue("diagramitemweight", font.weight()); settings.setValue("diagramitemweight", font.weight());
settings.setValue("diagramitemstyle", font.styleName()); settings.setValue("diagramitemstyle", font.styleName());
QString fontInfos = settings.value("diagramitemfont").toString() + " " +
settings.value("diagramitemsize").toString() + " (" +
settings.value("diagramitemweight").toString() + ", " +
settings.value("diagramitemfont").toString() + ")";
fontButton->setText(fontInfos);
} }
} }

1
sources/configpages.h
View File

@@ -116,6 +116,7 @@ public slots:
QGroupBox *lang_group_box; QGroupBox *lang_group_box;
QComboBox *lang_combo_box; QComboBox *lang_combo_box;
QLabel *lang_label; QLabel *lang_label;
QLabel *font_label;
QPushButton *fontButton; QPushButton *fontButton;
}; };