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 new settings value for save or not elements informations in copy/

Browse Source 
paste


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4601 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2016-08-04 09:54:43 +00:00
parent 13b8a2e6a0
commit 96f87271da
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/configpages.cpp
View File

@@ -234,6 +234,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
bool tabbed = settings.value("diagrameditor/viewmode", "tabbed") == "tabbed"; bool tabbed = settings.value("diagrameditor/viewmode", "tabbed") == "tabbed";
bool zoom_out_folio = settings.value("diagrameditor/zoom-out-beyond-of-folio", false).toBool(); bool zoom_out_folio = settings.value("diagrameditor/zoom-out-beyond-of-folio", false).toBool();
bool use_trackpad = settings.value("diagramview/gestures", false).toBool(); bool use_trackpad = settings.value("diagramview/gestures", false).toBool();
bool save_label_paste = settings.value("diagramcommands/save-label", true).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();
@@ -243,6 +244,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
windowed_mode_ = new QRadioButton(tr("Utiliser des fenêtres (appliqué au prochain lancement de QElectroTech)"), projects_view_mode_); windowed_mode_ = new QRadioButton(tr("Utiliser des fenêtres (appliqué au prochain lancement de QElectroTech)"), projects_view_mode_);
tabbed_mode_ = new QRadioButton(tr("Utiliser des onglets (appliqué au prochain lancement de QElectroTech)"), projects_view_mode_); tabbed_mode_ = new QRadioButton(tr("Utiliser des onglets (appliqué au prochain lancement de QElectroTech)"), 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_);
save_label_paste_ = new QCheckBox(tr("Ne pas conserver les labels des éléments lors des copier coller"), 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);
elements_management_ = new QGroupBox(tr("Gestion des éléments"), this); elements_management_ = new QGroupBox(tr("Gestion des éléments"), this);
@@ -260,6 +262,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
use_system_colors_ -> setChecked(use_system_colors); use_system_colors_ -> setChecked(use_system_colors);
use_trackpad_ -> setChecked(use_trackpad); use_trackpad_ -> setChecked(use_trackpad);
save_label_paste_ -> setChecked(save_label_paste);
if (tabbed) { if (tabbed) {
tabbed_mode_ -> setChecked(true); tabbed_mode_ -> setChecked(true);
@@ -281,6 +284,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(QWidget *parent) : ConfigPage
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_ -> setLayout(projects_view_mode_layout); projects_view_mode_ -> setLayout(projects_view_mode_layout);
QVBoxLayout *elements_management_layout = new QVBoxLayout(); QVBoxLayout *elements_management_layout = new QVBoxLayout();
@@ -343,6 +347,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("diagramcommands/save-label", save_label_paste_ -> isChecked());
settings.setValue("diagrameditor/zoom-out-beyond-of-folio", m_zoom_out_beyond_folio->isChecked()); settings.setValue("diagrameditor/zoom-out-beyond-of-folio", m_zoom_out_beyond_folio->isChecked());
} }

1
sources/configpages.h
View File

@@ -97,6 +97,7 @@ class GeneralConfigurationPage : public ConfigPage {
QGroupBox *appearance_; QGroupBox *appearance_;
QCheckBox *use_system_colors_; QCheckBox *use_system_colors_;
QCheckBox *use_trackpad_; QCheckBox *use_trackpad_;
QCheckBox *save_label_paste_;
QGroupBox *projects_view_mode_; QGroupBox *projects_view_mode_;
QRadioButton *windowed_mode_; QRadioButton *windowed_mode_;
QRadioButton *tabbed_mode_; QRadioButton *tabbed_mode_;

6
sources/diagramcommands.cpp
View File

@@ -169,6 +169,7 @@ void PasteDiagramCommand::undo()
void PasteDiagramCommand::redo() void PasteDiagramCommand::redo()
{ {
diagram -> showMe(); diagram -> showMe();
QSettings settings;
if (first_redo) { if (first_redo) {
first_redo = false; first_redo = false;
@@ -192,7 +193,8 @@ void PasteDiagramCommand::redo()
eti->setPlainText("_"); eti->setPlainText("_");
if (ElementTextItem *eti = e->taggedText("tension-protocol")) if (ElementTextItem *eti = e->taggedText("tension-protocol"))
eti->setPlainText("_"); eti->setPlainText("_");
} /*else { }
if (settings.value("diagramcommands/save-label", true).toBool()){
//Reset the information about the label, the comment and location //Reset the information about the label, the comment and location
e -> rElementInformations().addValue("label", ""); e -> rElementInformations().addValue("label", "");
e -> rElementInformations().addValue("comment", ""); e -> rElementInformations().addValue("comment", "");
@@ -201,7 +203,7 @@ void PasteDiagramCommand::redo()
//Reset the text field tagged "label //Reset the text field tagged "label
if (ElementTextItem *eti = e ->taggedText("label")) if (ElementTextItem *eti = e ->taggedText("label"))
eti -> setPlainText("_"); eti -> setPlainText("_");
}*/ }
} }
//Reset the text of conductors //Reset the text of conductors