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

Merge Qt5 branch sources folder to trunk

Browse Source 
-Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    sources/aboutqet.cpp
M    sources/bordertitleblock.cpp
M    sources/conductorproperties.h
M    sources/configdialog.cpp
M    sources/configpages.cpp
M    sources/configpages.h
M    sources/createdxf.h
M    sources/diagram.cpp
M    sources/diagram.h
M    sources/diagramcommands.cpp
M    sources/diagramcommands.h
M    sources/diagramprintdialog.cpp
M    sources/diagramprintdialog.h
M    sources/diagramschooser.cpp
M    sources/diagramschooser.h
M    sources/diagramview.cpp
M    sources/diagramview.h
M    sources/dvevent/dveventaddimage.cpp
M    sources/dvevent/dveventaddshape.cpp
M    sources/editor/arceditor.cpp
M    sources/editor/arceditor.h
M    sources/editor/editorcommands.cpp
M    sources/editor/editorcommands.h
M    sources/editor/elementitemeditor.h
M    sources/editor/elementprimitivedecorator.cpp
M    sources/editor/elementscene.cpp
M    sources/editor/elementscene.h
M    sources/editor/elementview.cpp
M    sources/editor/ellipseeditor.cpp
M    sources/editor/ellipseeditor.h
M    sources/editor/esevent/eseventaddtext.cpp
M    sources/editor/esevent/eseventaddtextfield.cpp
M    sources/editor/esevent/eseventinterface.cpp
M    sources/editor/graphicspart/customelementpart.h
M    sources/editor/graphicspart/parttext.cpp
M    sources/editor/graphicspart/parttext.h
M    sources/editor/graphicspart/parttextfield.cpp
M    sources/editor/graphicspart/parttextfield.h
M    sources/editor/lineeditor.cpp
M    sources/editor/lineeditor.h
M    sources/editor/polygoneditor.cpp
M    sources/editor/qetelementeditor.cpp
M    sources/editor/qetelementeditor.h
M    sources/editor/rectangleeditor.cpp
M    sources/editor/rectangleeditor.h
M    sources/editor/styleeditor.cpp
M    sources/editor/styleeditor.h
M    sources/editor/terminaleditor.cpp
M    sources/editor/terminaleditor.h
M    sources/editor/texteditor.cpp
M    sources/editor/texteditor.h
M    sources/editor/textfieldeditor.cpp
M    sources/editor/textfieldeditor.h
M    sources/editor/ui/elementpropertieseditorwidget.cpp
M    sources/elementdefinition.cpp
M    sources/elementdeleter.cpp
M    sources/elementdeleter.h
M    sources/elementdialog.cpp
M    sources/elementscategorieslist.h
M    sources/elementscategorieswidget.cpp
M    sources/elementscategorieswidget.h
M    sources/elementscategory.cpp
M    sources/elementscategorydeleter.cpp
M    sources/elementscategorydeleter.h
M    sources/elementscategoryeditor.cpp
M    sources/elementscategoryeditor.h
M    sources/elementscollection.cpp
M    sources/elementscollectioncache.cpp
M    sources/elementspanel.cpp
M    sources/elementspanel.h
M    sources/elementspanelwidget.cpp
M    sources/elementspanelwidget.h
M    sources/elementtextsmover.h
M    sources/exportdialog.cpp
M    sources/exportdialog.h
M    sources/exportproperties.cpp
M    sources/exportpropertieswidget.cpp
M    sources/exportpropertieswidget.h
M    sources/genericpanel.cpp
M    sources/integrationmoveelementshandler.cpp
M    sources/integrationmoveelementshandler.h
M    sources/interactivemoveelementshandler.cpp
M    sources/nameslistwidget.cpp
M    sources/nameslistwidget.h
M    sources/newelementwizard.cpp
M    sources/newelementwizard.h
M    sources/nomenclature.cpp
M    sources/nomenclature.h
M    sources/projectconfigpages.cpp
M    sources/projectview.cpp
M    sources/projectview.h
M    sources/qet.cpp
M    sources/qetapp.cpp
M    sources/qetapp.h
M    sources/qetdiagrameditor.cpp
M    sources/qetdiagrameditor.h
M    sources/qetgraphicsitem/conductor.cpp
M    sources/qetgraphicsitem/conductortextitem.cpp
M    sources/qetgraphicsitem/customelement.cpp
M    sources/qetgraphicsitem/diagramimageitem.cpp
M    sources/qetgraphicsitem/diagramtextitem.cpp
M    sources/qetgraphicsitem/diagramtextitem.h
M    sources/qetgraphicsitem/element.cpp
M    sources/qetgraphicsitem/ghostelement.cpp
M    sources/qetgraphicsitem/qetshapeitem.cpp
M    sources/qetgraphicsitem/terminal.cpp
M    sources/qetgraphicsitem/terminal.h
M    sources/qeticons.cpp
M    sources/qeticons.h
M    sources/qetmainwindow.cpp
M    sources/qetmessagebox.cpp
M    sources/qetmessagebox.h
M    sources/qetprintpreviewdialog.cpp
M    sources/qetprintpreviewdialog.h
M    sources/qetproject.cpp
M    sources/qetsingleapplication.cpp
M    sources/qettabbar.h
M    sources/qfilenameedit.cpp
M    sources/qtextorientationspinboxwidget.cpp
M    sources/qtextorientationspinboxwidget.h
M    sources/qtextorientationwidget.cpp
M    sources/qtextorientationwidget.h
M    sources/richtext/richtexteditor.cpp
M    sources/richtext/richtexteditor_p.h
M    sources/richtext/ui_addlinkdialog.h
M    sources/titleblock/dimensionwidget.h
M    sources/titleblock/gridlayoutanimation.h
M    sources/titleblock/helpercell.h
M    sources/titleblock/integrationmovetemplateshandler.cpp
M    sources/titleblock/integrationmovetemplateshandler.h
M    sources/titleblock/qettemplateeditor.cpp
M    sources/titleblock/qettemplateeditor.h
M    sources/titleblock/templatecellsset.h
M    sources/titleblock/templatecellwidget.cpp
M    sources/titleblock/templatecellwidget.h
M    sources/titleblock/templatecommands.cpp
M    sources/titleblock/templatedeleter.cpp
M    sources/titleblock/templatedeleter.h
M    sources/titleblock/templatelocationchooser.cpp
M    sources/titleblock/templatelocationchooser.h
M    sources/titleblock/templatelocationsaver.cpp
M    sources/titleblock/templatelocationsaver.h
M    sources/titleblock/templatelogomanager.cpp
M    sources/titleblock/templatelogomanager.h
M    sources/titleblock/templateview.cpp
M    sources/titleblock/templatevisualcell.h
M    sources/titleblockcell.cpp
M    sources/titleblocktemplate.cpp
M    sources/treecoloranimation.h
M    sources/ui/conductorpropertieswidget.cpp
M    sources/ui/diagrampropertiesdialog.cpp
M    sources/ui/diagramselection.cpp
M    sources/ui/dialogautonum.cpp
M    sources/ui/dialogwaiting.cpp
M    sources/ui/elementpropertieswidget.cpp
M    sources/ui/elementselectorwidget.cpp
M    sources/ui/linksingleelementwidget.cpp
M    sources/ui/masterpropertieswidget.cpp
M    sources/ui/potentialtextsdialog.cpp
M    sources/ui/projectpropertiesdialog.cpp
M    sources/ui/selectautonumw.cpp
M    sources/ui/titleblockpropertieswidget.cpp
M    sources/ui/xrefpropertieswidget.cpp
M    sources/undocommand/changeelementinformationcommand.cpp


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3783 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2015-03-02 20:14:56 +00:00
parent 823e4f0570
commit 81c684ca49
164 changed files with 1066 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sources/titleblock/templatelogomanager.cpp
View File

@@ -19,6 +19,8 @@
#include "titleblocktemplate.h"
#include "qeticons.h"
#include <QStandardPaths>
/**
Constructor
@param managed_template Title block template this widget manages logos for.
@@ -70,12 +72,12 @@ void TitleBlockTemplateLogoManager::emitLogosChangedSignal() {
Initialize widgets composing the Logo manager
*/
void TitleBlockTemplateLogoManager::initWidgets() {
open_dialog_dir_ = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
open_dialog_dir_ = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
setWindowTitle(tr("Gestionnaire de logos"));
setWindowIcon(QET::Icons::InsertImage);
setWindowFlags(Qt::Dialog);
logos_label_ = new QLabel(tr("Logos embarqu\351s dans ce mod\350le :"));
logos_label_ = new QLabel(tr("Logos embarqués dans ce modèle :"));
logos_view_ = new QListWidget();
logos_view_ -> setViewMode(QListView::IconMode);
logos_view_ -> setGridSize(iconsize() * 1.4);
@@ -87,7 +89,7 @@ void TitleBlockTemplateLogoManager::initWidgets() {
add_button_ = new QPushButton(QET::Icons::Add, tr("Ajouter un logo"));
export_button_ = new QPushButton(QET::Icons::DocumentExport, tr("Exporter ce logo"));
delete_button_ = new QPushButton(QET::Icons::Remove, tr("Supprimer ce logo"));
logo_box_ = new QGroupBox(tr("Propri\351t\351s"));
logo_box_ = new QGroupBox(tr("Propriétés"));
logo_name_label_ = new QLabel(tr("Nom :"));
logo_name_ = new QLineEdit();
rename_button_ = new QPushButton(QET::Icons::EditRename, tr("Renommer"));
@@ -185,7 +187,7 @@ QString TitleBlockTemplateLogoManager::confirmLogoName(const QString &initial_na
while (managed_template_ -> logos().contains(name)) {
if (!rename_dialog) {
rename_dialog = new QDialog(this);
rename_dialog -> setWindowTitle(tr("Logo d\351j\340 existant"));
rename_dialog -> setWindowTitle(tr("Logo déjà existant"));
rd_label = new QLabel();
rd_label -> setWordWrap(true);
@@ -212,9 +214,9 @@ QString TitleBlockTemplateLogoManager::confirmLogoName(const QString &initial_na
}
rd_label -> setText(
QString(tr(
"Il existe d\351j\340 un logo portant le nom \"%1\" au sein de "
"ce mod\350le de cartouche. Voulez-vous le remplacer ou "
"pr\351f\351rez-vous sp\351cifier un autre nom pour ce nouveau "
"Il existe déjà un logo portant le nom \"%1\" au sein de "
"ce modèle de cartouche. Voulez-vous le remplacer ou "
"préférez-vous spécifier un autre nom pour ce nouveau "
"logo ?"
)).arg(name)
);
@@ -273,7 +275,7 @@ void TitleBlockTemplateLogoManager::addLogo() {
// that filepath needs to point to a valid, readable file
QFileInfo filepath_info(filepath);
if (!filepath_info.exists() || !filepath_info.isReadable()) {
QMessageBox::critical(this, tr("Erreur"), tr("Impossible d'ouvrir le fichier sp\351cifi\351"));
QMessageBox::critical(this, tr("Erreur"), tr("Impossible d'ouvrir le fichier spécifié"));
return;
}
@@ -305,7 +307,7 @@ void TitleBlockTemplateLogoManager::exportLogo() {
bool save_logo = managed_template_ -> saveLogoToFile(current_logo, filepath);
if (!save_logo) {
QMessageBox::critical(this, tr("Erreur"), QString(tr("Impossible d'exporter vers le fichier sp\351cifi\351")));
QMessageBox::critical(this, tr("Erreur"), QString(tr("Impossible d'exporter vers le fichier spécifié")));
} else {
open_dialog_dir_ = QDir(filepath);
}
@@ -346,7 +348,7 @@ void TitleBlockTemplateLogoManager::renameLogo() {
QMessageBox::warning(
this,
warning_title,
tr("Le nouveau nom ne peut pas \352tre vide.")
tr("Le nouveau nom ne peut pas être vide.")
);
return;
}
@@ -355,7 +357,7 @@ void TitleBlockTemplateLogoManager::renameLogo() {
QMessageBox::warning(
this,
warning_title,
tr("Le nom saisi est d\351j\340 utilis\351 par un autre logo.")
tr("Le nom saisi est déjà utilisé par un autre logo.")
);
return;
}