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
6,404 Commits 32 Branches 43 Tags
test_merge
Commit Graph

6404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon De Backer
32a90493bd TEST a Merge branch 'XMLProperties' 
it gets built let's test it for bugs

 Conflicts:
	sources/ElementsCollection/fileelementcollectionitem.cpp
	sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
	sources/borderproperties.cpp
	sources/conductorproperties.cpp
	sources/conductorproperties.h
	sources/diagram.cpp
	sources/diagram.h
	sources/diagramprintdialog.cpp
	sources/diagramprintdialog.h
	sources/editor/graphicspart/customelementgraphicpart.cpp
	sources/editor/graphicspart/partarc.cpp
	sources/editor/graphicspart/partdynamictextfield.cpp
	sources/editor/graphicspart/partdynamictextfield.h
	sources/editor/graphicspart/partellipse.cpp
	sources/editor/graphicspart/partline.cpp
	sources/editor/graphicspart/partpolygon.cpp
	sources/editor/graphicspart/partrectangle.cpp
	sources/editor/graphicspart/partterminal.cpp
	sources/editor/graphicspart/partterminal.h
	sources/editor/graphicspart/parttext.cpp
	sources/properties/propertiesinterface.cpp
	sources/properties/propertiesinterface.h
	sources/properties/terminaldata.cpp
	sources/properties/terminaldata.h
	sources/properties/xrefproperties.cpp
	sources/properties/xrefproperties.h
	sources/qetgraphicsitem/conductor.cpp
	sources/qetgraphicsitem/conductor.h
	sources/qetgraphicsitem/conductortextitem.h
	sources/qetgraphicsitem/dynamicelementtextitem.h
	sources/qetgraphicsitem/element.cpp
	sources/qetgraphicsitem/element.h
	sources/qetgraphicsitem/elementtextitemgroup.h
	sources/qetgraphicsitem/slaveelement.cpp
	sources/qetgraphicsitem/slaveelement.h
	sources/qetgraphicsitem/terminal.cpp
	sources/qetgraphicsitem/terminal.h
	sources/qetproject.cpp
	sources/titleblockproperties.cpp
 2020-10-13 22:31:58 +02:00
Simon De Backer
364012848c Fix code style 2020-10-13 17:44:08 +02:00
Simon De Backer
106b17cf2f QT6: QMutex::RecursionMode are obsolete 
The default is QMutex::NonRecursive.
https://doc-snapshots.qt.io/qt6-dev/qmutex-obsolete.html
 2020-10-13 17:43:26 +02:00
Claveau Joshua
d3da5a98a5 Minor : disable button for QPageSetupDialog on windows 2020-10-12 21:20:40 +02:00
Claveau Joshua
9b0e659300 Remove unused class 2020-10-12 21:02:48 +02:00
Martin Marmsoler
eb5494c360 Merge branch 'XMLProperties' of ssh://git.tuxfamily.org/gitroot/qet/qet into XMLProperties 2020-10-12 19:14:02 +02:00
Martin Marmsoler
c0d9bf9548 use more meaningful name 2020-10-12 19:11:01 +02:00
pavelfric
30f8989e3d Updated Czech translation 2020-10-11 21:56:53 +02:00
Martin Marmsoler
f79b1a52bb WIP 2020-10-11 11:05:22 +02:00
Claveau Joshua
e878082b79 Fix bug 203 
https://qelectrotech.org/bugtracker/view.php?id=203
Take advantage of this bugfix, to recode the widget with Qt designer.
 2020-10-10 16:58:02 +02:00
Martin Marmsoler
3509a1c7a5 add comments and move some initializations from the source file to the header file 2020-10-10 15:50:04 +02:00
Claveau Joshua
419585f97e Add new QAction : export to pdf 2020-10-10 14:37:23 +02:00
Martin Marmsoler
0dfe0c1613 let conductor textitem export to xml, because the read is also made from it 2020-10-10 12:25:58 +02:00
Martin Marmsoler
497673d83b make createProperty methods static, because they can be used also outside of this class 2020-10-10 12:21:37 +02:00
Claveau Joshua
44e945489a project print window : minor gui improvement 2020-10-10 12:12:50 +02:00
Martin Marmsoler
f18e6bd50f remove default parameter, because it leads only to confusion and errors 2020-10-10 12:02:38 +02:00
Claveau Joshua
b45c6b453e Minor fix : QetGraphicsTableItem keep his size when model is reseted or when open from xml. 2020-10-10 11:18:21 +02:00
Martin Marmsoler
9b8c0101be new method to load properties must be used, otherwise nothing valid will be read 2020-10-10 11:17:15 +02:00
Claveau Joshua
5d47ecd8f6 Fix : can't open print dialog on windows 2020-10-09 19:25:41 +02:00
Remi Collet
639ccb25e2 use pkgconfig for sqlite3 2020-10-09 08:37:27 +02:00
Martin Marmsoler
0cc6558281 Fix issue that conductors where connected wrong. This was, because instead of reusing the id's stored in the Terminal, new id's where created 2020-10-08 19:05:30 +02:00
Martin Marmsoler
52f886e34b add comment 2020-10-08 18:39:11 +02:00
Simon De Backer
746c5a81e3 Merge branch 'master' of ssh://debacker@git.tuxfamily.org/gitroot/qet/qet.git into master 2020-10-08 16:17:15 +02:00
Simon De Backer
4e44b4bcd4 QT6: Fix : dragging view don't work 2020-10-08 16:16:59 +02:00
Martin Marmsoler
a1cf3711a1 Fix issues 2020-10-07 08:05:01 +02:00
dlee99
04125dcc55 modified: lang/qet_nl.qm 
modified:   lang/qet_nl.ts
 2020-10-06 23:32:40 +02:00
Martin Marmsoler
b958848194 Update conductorproperties.cpp and conductor.cpp 2020-10-06 21:40:48 +02:00
Martin Marmsoler
2d21391a09 - AlignBottom shoud be the default 
- move inital values to header file
 2020-10-06 18:44:14 +02:00
Martin Marmsoler
beeeb252b4 fix problem of not showing reference labels 2020-10-06 17:07:16 +02:00
Martin Marmsoler
6d2a88e85f use default value if the parameter is not available 2020-10-06 12:48:39 +02:00
artgg7300
d6f08696bc translated hungarian files 2020-10-06 06:19:03 +02:00
Martin Marmsoler
8ef8a71680 add comment 2020-10-05 21:54:26 +02:00
Claveau Joshua
9193e1c39b Fix : dragging view don't work 2020-10-04 16:03:09 +02:00
David Varley
941aaf7087 Fix build for Qt < 5.10 2020-10-04 20:51:07 +11:00
Martin Marmsoler
8829974852 add comment 2020-10-04 09:34:34 +02:00
Martin Marmsoler
871a2642f4 use m_pos as value to store 2020-10-04 09:34:25 +02:00
Martin Marmsoler
9153588c94 store position when exporting to xml, because terminalData will create the document from m_pos 2020-10-04 09:33:16 +02:00
Martin Marmsoler
f3368f159d Fix problem that not all childs were added to the xml document 2020-10-03 20:50:08 +02:00
Simon De Backer
f5d2fc3916 Merge branch 'QT6' into master 
initial release to Qt6

TODO:
 -remove KCoreAddons
 -remove KWidgetsAddons

* QT6: (24 commits)
  QT6: No Qt::AA_EnableHighDpiScaling in QT6
  QT6: TeDo mod QList for DeleteQGraphicsItemCommand
  QT6: Todo Fix QtConcurrent (remove KCoreAddons?)
  QT6: Todo QVariant::setValue
  QT6: std::min needs further tweaking
  QPrinting class needs further tweaking
  QT6: QStyleOptionGraphicsItem
  Add QActionGroup
  QT6: QStyleOptionGraphicsItem
  QT6: QLibraryInfo
  Totest QRegularExpression ok?
  QT6: QStyleOptionGraphicsItem
  QT6: QMouseEvent
  QT6: QDropEvent
  QT6: Fix deprecated QRegExp
  QT6: hooks added
  QT6: Mod unused function put in comments
  Add missing include QActionGroup
  QT6: set C++17
  QT6: diagramitemweight set val to Font::Weight
  ...
 2020-10-03 16:18:03 +02:00
Simon De Backer
9f3c173b9f QT6: No Qt::AA_EnableHighDpiScaling in QT6 2020-10-03 16:08:55 +02:00
Simon De Backer
9a915c2ad0 QT6: TeDo mod QList for DeleteQGraphicsItemCommand 2020-10-03 16:07:55 +02:00
Simon De Backer
694cbfb1b7 QT6: Todo Fix QtConcurrent (remove KCoreAddons?) 2020-10-03 16:04:54 +02:00
Simon De Backer
f69e3a3fa7 QT6: Todo QVariant::setValue 2020-10-03 16:02:35 +02:00
Simon De Backer
8a5ba90d01 QT6: std::min needs further tweaking 2020-10-03 16:00:24 +02:00
Simon De Backer
32605e1377 QPrinting class needs further tweaking 2020-10-03 15:58:09 +02:00
Simon De Backer
0ab1b322d6 QT6: QStyleOptionGraphicsItem 2020-10-03 15:56:11 +02:00
Simon De Backer
a7920ea5fc Add QActionGroup 2020-10-03 15:54:38 +02:00
Simon De Backer
937a6d740b QT6: QStyleOptionGraphicsItem 2020-10-03 15:54:02 +02:00
Simon De Backer
a0b95ee944 QT6: QLibraryInfo 2020-10-03 15:51:53 +02:00
Simon De Backer
ad0df66ab1 Totest QRegularExpression ok? 2020-10-03 15:51:09 +02:00