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

Add option to draw or not the grid outside of the border of folio.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3850 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-03-24 23:10:15 +00:00
parent 2f9fd79371
commit af63714517
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sources/configpages.cpp
View File

@@ -186,18 +186,19 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
bool use_system_colors = settings.value("usesystemcolors", "true").toBool(); bool use_system_colors = settings.value("usesystemcolors", "true").toBool();
bool tabbed = settings.value("diagrameditor/viewmode", "tabbed") == "tabbed"; bool tabbed = settings.value("diagrameditor/viewmode", "tabbed") == "tabbed";
bool integrate_elements = settings.value("diagrameditor/integrate-elements", true).toBool(); bool integrate_elements = settings.value("diagrameditor/integrate-elements", true).toBool();
bool grid_outside = settings.value("diagrameditor/draw-grid-outside-of-border", false).toBool();
bool use_trackpad = settings.value("diagramview/gestures", false).toBool(); bool use_trackpad = settings.value("diagramview/gestures", false).toBool();
bool highlight_integrated_elements = settings.value("diagrameditor/highlight-integrated-elements", true).toBool(); bool highlight_integrated_elements = settings.value("diagrameditor/highlight-integrated-elements", true).toBool();
QString default_element_informations = settings.value("elementeditor/default-informations", "").toString(); QString default_element_informations = settings.value("elementeditor/default-informations", "").toString();
appearance_ = new QGroupBox(tr("Apparence"), this); appearance_ = new QGroupBox(tr("Apparence"), this);
use_system_colors_ = new QCheckBox(tr("Utiliser les couleurs du système"), appearance_); use_system_colors_ = new QCheckBox(tr("Utiliser les couleurs du système"), appearance_);
projects_view_mode_ = new QGroupBox(tr("Projets"), this); projects_view_mode_ = new QGroupBox(tr("Projets"), this);
windowed_mode_ = new QRadioButton(tr("Utiliser des fenêtres"), projects_view_mode_); windowed_mode_ = new QRadioButton(tr("Utiliser des fenêtres"), projects_view_mode_);
tabbed_mode_ = new QRadioButton(tr("Utiliser des onglets"), projects_view_mode_); tabbed_mode_ = new QRadioButton(tr("Utiliser des onglets"), projects_view_mode_);
use_trackpad_ = new QCheckBox(tr("Utiliser les gestes du pavé tactile"), projects_view_mode_); use_trackpad_ = new QCheckBox(tr("Utiliser les gestes du pavé tactile"), projects_view_mode_);
warning_view_mode_ = new QLabel(tr("Ces paramètres s'appliqueront dès la prochaine ouverture d'un éditeur de schémas.")); warning_view_mode_ = new QLabel(tr("Ces paramètres s'appliqueront dès la prochaine ouverture d'un éditeur de schémas."));
m_grid_outside_border = new QCheckBox(tr("Dessiner la grille au-delà des bords du folio"), this);
elements_management_ = new QGroupBox(tr("Gestion des éléments"), this); elements_management_ = new QGroupBox(tr("Gestion des éléments"), this);
integrate_elements_ = new QCheckBox(tr("Intégrer automatiquement les éléments dans les projets (recommandé)")); integrate_elements_ = new QCheckBox(tr("Intégrer automatiquement les éléments dans les projets (recommandé)"));
@@ -221,6 +222,8 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
} else { } else {
windowed_mode_ -> setChecked(true); windowed_mode_ -> setChecked(true);
} }
m_grid_outside_border -> setChecked(grid_outside);
integrate_elements_ -> setChecked(integrate_elements); integrate_elements_ -> setChecked(integrate_elements);
highlight_integrated_elements_ -> setChecked(highlight_integrated_elements); highlight_integrated_elements_ -> setChecked(highlight_integrated_elements);
@@ -230,7 +233,8 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
appearance_layout -> addWidget(use_system_colors_); appearance_layout -> addWidget(use_system_colors_);
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(m_grid_outside_border);
projects_view_mode_layout -> addWidget(windowed_mode_); 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(warning_view_mode_); projects_view_mode_layout -> addWidget(warning_view_mode_);
@@ -298,6 +302,7 @@ void GeneralConfigurationPage::applyConf() {
settings.setValue("diagrameditor/highlight-integrated-elements", highlight_integrated_elements_ -> isChecked()); settings.setValue("diagrameditor/highlight-integrated-elements", highlight_integrated_elements_ -> isChecked());
settings.setValue("elementeditor/default-informations", default_element_infos_textfield_ -> toPlainText()); settings.setValue("elementeditor/default-informations", default_element_infos_textfield_ -> toPlainText());
settings.setValue("diagramview/gestures", use_trackpad_ -> isChecked()); settings.setValue("diagramview/gestures", use_trackpad_ -> isChecked());
settings.setValue("diagrameditor/draw-grid-outside-of-border", m_grid_outside_border->isChecked());
} }
/// @return l'icone de cette page /// @return l'icone de cette page

1
sources/configpages.h
View File

@@ -89,6 +89,7 @@ class GeneralConfigurationPage : public ConfigPage {
QGroupBox *projects_view_mode_; QGroupBox *projects_view_mode_;
QRadioButton *windowed_mode_; QRadioButton *windowed_mode_;
QRadioButton *tabbed_mode_; QRadioButton *tabbed_mode_;
QCheckBox *m_grid_outside_border;
QLabel *warning_view_mode_; QLabel *warning_view_mode_;
QGroupBox *elements_management_; QGroupBox *elements_management_;
QCheckBox *integrate_elements_; QCheckBox *integrate_elements_;

6
sources/diagram.cpp
View File

@@ -134,7 +134,11 @@ void Diagram::drawBackground(QPainter *p, const QRectF &r) {
p->setPen(pen); p->setPen(pen);
p -> setBrush(Qt::NoBrush); p -> setBrush(Qt::NoBrush);
QRectF rect = border_and_titleblock.insideBorderRect().intersected(r);
QRectF rect = QETApp::settings().value("diagrameditor/draw-grid-outside-of-border", false).toBool() ?
r :
border_and_titleblock.insideBorderRect().intersected(r);
qreal limite_x = rect.x() + rect.width(); qreal limite_x = rect.x() + rect.width();
qreal limite_y = rect.y() + rect.height(); qreal limite_y = rect.y() + rect.height();