490 lines
26 KiB
Plaintext
490 lines
26 KiB
Plaintext
From 87e88a1b7c5035137d915168f4927b115f09b9ea Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Tue, 13 Aug 2019 20:41:39 +1000
|
|
Subject: Fix build for Haiku
|
|
|
|
|
|
diff --git a/qelectrotech.pro b/qelectrotech.pro
|
|
index 07e51fb..991a9c0 100644
|
|
--- a/qelectrotech.pro
|
|
+++ b/qelectrotech.pro
|
|
@@ -33,6 +33,18 @@ win32 {
|
|
# Liste des ressources Windows
|
|
#RC_FILE = qelectrotech.rc
|
|
}
|
|
+haiku {
|
|
+ COMPIL_PREFIX = $$prefix'/'
|
|
+ INSTALL_PREFIX = $$prefix'/'
|
|
+ QET_BINARY_PATH = './'
|
|
+ QET_COMMON_COLLECTION_PATH = 'elements/'
|
|
+ QET_COMMON_TBT_PATH = 'titleblocks/'
|
|
+ QET_LANG_PATH = 'lang/'
|
|
+ QET_EXAMPLES_PATH = 'examples/'
|
|
+ QET_LICENSE_PATH = 'license/'
|
|
+ QET_MAN_PATH = '../../documentation/man/'
|
|
+ QET_APPDATA_PATH = '../../data/appdata/'
|
|
+}
|
|
macx {
|
|
# Chemins MacOS X
|
|
COMPIL_PREFIX = './'
|
|
@@ -160,7 +172,8 @@ RESOURCES += qelectrotech.qrc
|
|
TRANSLATIONS += lang/qet_en.ts lang/qet_es.ts lang/qet_fr.ts lang/qet_ru.ts lang/qet_pt.ts lang/qet_cs.ts lang/qet_pl.ts lang/qet_de.ts lang/qet_ro.ts lang/qet_it.ts lang/qet_el.ts lang/qet_nl.ts lang/qet_be.ts
|
|
|
|
# Modules Qt utilises par l'application
|
|
-QT += xml svg network sql widgets printsupport concurrent KWidgetsAddons KCoreAddons
|
|
+QT += xml svg network sql widgets printsupport concurrent
|
|
+LIBS += -lKF5WidgetsAddons -lKF5CoreAddons
|
|
|
|
# UI DESIGNER FILES AND GENERATION SOURCES FILES
|
|
FORMS += $$files(sources/richtext/*.ui) \
|
|
@@ -236,10 +249,14 @@ man.extra = sh man/compress_man_pages.sh
|
|
# L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
|
|
INSTALLS += target elements tbt lang copyright
|
|
# Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
|
|
-unix {
|
|
+unix:!haiku {
|
|
INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata
|
|
}
|
|
|
|
+haiku {
|
|
+ INSTALLS += mime_xml mime_desktop mime_package man examples appdata
|
|
+}
|
|
+
|
|
# Options de compilation communes a Unix et MacOS X
|
|
unix {
|
|
# Chemin des fichiers de traduction ; par defaut : lang/ dans le repertoire d'execution
|
|
diff --git a/sources/ui/importelementdialog.h b/sources/ui/importelementdialog.h
|
|
index 9316c2f..dd02b80 100644
|
|
--- a/sources/ui/importelementdialog.h
|
|
+++ b/sources/ui/importelementdialog.h
|
|
@@ -19,6 +19,7 @@
|
|
#define IMPORTELEMENTDIALOG_H
|
|
|
|
#include <QDialog>
|
|
+#include <QButtonGroup>
|
|
#include "qet.h"
|
|
|
|
namespace Ui {
|
|
--
|
|
2.23.0
|
|
|
|
|
|
From 0cf7b6b681c693ed16420da4952f86b15610a19a Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Thu, 17 Oct 2019 20:58:39 +1000
|
|
Subject: Hack for crash on exit
|
|
|
|
|
|
diff --git a/sources/main.cpp b/sources/main.cpp
|
|
index 62e007a..df06125 100644
|
|
--- a/sources/main.cpp
|
|
+++ b/sources/main.cpp
|
|
@@ -15,6 +15,13 @@
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
+
|
|
+#ifdef __HAIKU__
|
|
+#include <unistd.h>
|
|
+#include <sys/types.h>
|
|
+#include <signal.h>
|
|
+#endif
|
|
+
|
|
#include "qetapp.h"
|
|
#include "singleapplication.h"
|
|
#include "qet.h"
|
|
@@ -64,6 +71,12 @@ int main(int argc, char **argv)
|
|
QETApp::instance()->installEventFilter(&qetapp);
|
|
QObject::connect(&app, &SingleApplication::receivedMessage, &qetapp, &QETApp::receiveMessage);
|
|
|
|
+#ifndef __HAIKU__
|
|
return app.exec();
|
|
+#else
|
|
+ app.exec();
|
|
+ kill(::getpid(), SIGKILL);
|
|
+ return 0;
|
|
+#endif
|
|
}
|
|
|
|
--
|
|
2.23.0
|
|
|
|
|
|
From 3125f1f9aa427bbd8dd3113023f01ec611649729 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Thu, 17 Oct 2019 20:59:03 +1000
|
|
Subject: Use icons from system theme
|
|
|
|
|
|
diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp
|
|
index 5432592..f128717 100644
|
|
--- a/sources/qeticons.cpp
|
|
+++ b/sources/qeticons.cpp
|
|
@@ -228,20 +228,14 @@ void QET::Icons::initIcons() {
|
|
bool rtl = QApplication::isRightToLeft();
|
|
QTransform reverse = QTransform().scale(-1, 1);
|
|
|
|
- Add .addFile(":/ico/16x16/list-add.png");
|
|
- Add .addFile(":/ico/22x22/list-add.png");
|
|
+ Add = QIcon::fromTheme("list-add");
|
|
AddFolio .addFile(":/ico/16x16/folio-new.png");
|
|
- Allowed .addFile(":/ico/16x16/user-online.png");
|
|
- ApplicationExit .addFile(":/ico/16x16/application-exit.png");
|
|
- ApplicationExit .addFile(":/ico/22x22/application-exit.png");
|
|
- ArrowLeft .addFile(":/ico/16x16/arrow-left.png");
|
|
- ArrowLeft .addFile(":/ico/22x22/arrow-left.png");
|
|
- ArrowLeftDouble .addFile(":/ico/16x16/arrow-left-double.png");
|
|
- ArrowLeftDouble .addFile(":/ico/22x22/arrow-left-double.png");
|
|
- ArrowRight .addFile(":/ico/16x16/arrow-right.png");
|
|
- ArrowRight .addFile(":/ico/22x22/arrow-right.png");
|
|
- ArrowRightDouble .addFile(":/ico/16x16/arrow-right-double.png");
|
|
- ArrowRightDouble .addFile(":/ico/22x22/arrow-right-double.png");
|
|
+ Allowed = QIcon::fromTheme("im-user-online");
|
|
+ ApplicationExit = QIcon::fromTheme("application-exit");
|
|
+ ArrowLeft = QIcon::fromTheme("arrow-left");
|
|
+ ArrowLeftDouble = QIcon::fromTheme("arrow-left-double");
|
|
+ ArrowRight = QIcon::fromTheme("arrow-right");
|
|
+ ArrowRightDouble = QIcon::fromTheme("arrow-right-double");
|
|
Autoconnect .addFile(":/ico/22x22/autoconnect.png");
|
|
BringForward .addFile(":/ico/22x22/bring_forward.png");
|
|
Cancel .addFile(":/ico/16x16/item-cancel.png");
|
|
@@ -249,82 +243,46 @@ void QET::Icons::initIcons() {
|
|
ConductorEdit .addFile(":/ico/16x16/conductor-edit.png");
|
|
ConductorSettings .addFile(":/ico/16x16/conductor-reset.png");
|
|
ConductorSettings .addFile(":/ico/22x22/conductor2.png");
|
|
- Configure .addFile(":/ico/16x16/configure.png");
|
|
- Configure .addFile(":/ico/22x22/configure.png");
|
|
- ConfigureToolbars .addFile(":/ico/16x16/configure-toolbars.png");
|
|
- ConfigureToolbars .addFile(":/ico/22x22/configure-toolbars.png");
|
|
+ Configure = QIcon::fromTheme("configure");
|
|
+ ConfigureToolbars = QIcon::fromTheme("configure-toolbars");
|
|
IC_CopyFile .addFile(":/ico/16x16/item-copy.png");
|
|
DiagramAdd .addFile(":/ico/16x16/folio-new.png");
|
|
DiagramAdd .addFile(":/ico/22x22/diagram_add.png");
|
|
Diagram .addFile(":/ico/16x16/diagram.png");
|
|
Diagram .addFile(":/ico/diagram.png");
|
|
- DiagramBg .addFile(":/ico/22x22/diagram_bg.png");
|
|
+ DiagramBg = QIcon::fromTheme("object-inverse");
|
|
DiagramDelete .addFile(":/ico/16x16/folio-delete.png");
|
|
DiagramDelete .addFile(":/ico/22x22/diagram_del.png");
|
|
- DialogCancel .addFile(":/ico/16x16/dialog-cancel.png");
|
|
- DialogCancel .addFile(":/ico/22x22/dialog-cancel.png");
|
|
- DialogInformation .addFile(":/ico/16x16/folio-properties.png");
|
|
- DialogInformation .addFile(":/ico/22x22/dialog-information.png");
|
|
- DialogOk .addFile(":/ico/16x16/dialog-ok.png");
|
|
- DialogOk .addFile(":/ico/22x22/dialog-ok.png");
|
|
- DocumentClose .addFile(":/ico/16x16/document-close.png");
|
|
- DocumentClose .addFile(":/ico/22x22/document-close.png");
|
|
- DocumentExport .addFile(":/ico/16x16/document-export.png");
|
|
+ DialogCancel = QIcon::fromTheme("dialog-cancel");
|
|
+ DialogInformation = QIcon::fromTheme("dialog-information");
|
|
+ DialogOk = QIcon::fromTheme("dialog-ok");
|
|
+ DocumentClose = QIcon::fromTheme("document-close");
|
|
DocumentExport .addFile(":/ico/22x22/document-export.png");
|
|
- DocumentSpreadsheet .addFile(":/ico/16x16/export-csv.png");
|
|
DocumentExport .addFile(":/ico/128x128/document-export.png");
|
|
- DocumentImport .addFile(":/ico/16x16/document-import.png");
|
|
- DocumentImport .addFile(":/ico/22x22/document-import.png");
|
|
- DocumentNew .addFile(":/ico/16x16/document-new.png");
|
|
- DocumentNew .addFile(":/ico/22x22/document-new.png");
|
|
- DocumentOpen .addFile(":/ico/16x16/document-open.png");
|
|
- DocumentOpen .addFile(":/ico/22x22/document-open.png");
|
|
- DocumentOpenRecent .addFile(":/ico/16x16/document-open-recent.png");
|
|
- DocumentOpenRecent .addFile(":/ico/22x22/document-open-recent.png");
|
|
- DocumentPrint .addFile(":/ico/16x16/document-print.png");
|
|
- DocumentPrint .addFile(":/ico/22x22/document-print.png");
|
|
- DocumentPrintFrame .addFile(":/ico/16x16/document-print-frame.png");
|
|
- DocumentPrintFrame .addFile(":/ico/48x48/document-print-frame.png");
|
|
- DocumentSave .addFile(":/ico/16x16/document-save.png");
|
|
- DocumentSave .addFile(":/ico/22x22/document-save.png");
|
|
- DocumentSaveAll .addFile(":/ico/16x16/document-save-all.png");
|
|
- DocumentSaveAll .addFile(":/ico/22x22/document-save-all.png");
|
|
- DocumentSaveAs .addFile(":/ico/16x16/document-save-as.png");
|
|
- DocumentSaveAs .addFile(":/ico/22x22/document-save-as.png");
|
|
+ DocumentSpreadsheet .addFile(":/ico/16x16/export-csv.png");
|
|
+ DocumentImport = QIcon::fromTheme("document-import");
|
|
+ DocumentNew = QIcon::fromTheme("document-new");
|
|
+ DocumentOpen = QIcon::fromTheme("document-open");
|
|
+ DocumentOpenRecent = QIcon::fromTheme("document-open-recent");
|
|
+ DocumentPrint = QIcon::fromTheme("document-print");
|
|
+ DocumentPrintFrame = QIcon::fromTheme("document-print-frame");
|
|
+ DocumentSave = QIcon::fromTheme("document-save");
|
|
+ DocumentSaveAll = QIcon::fromTheme("document-save-all");
|
|
+ DocumentSaveAs = QIcon::fromTheme("document-save-as");
|
|
East .addFile(":/ico/16x16/east.png");
|
|
- EditClear .addFile(":/ico/16x16/edit-clear.png");
|
|
- EditClear .addFile(":/ico/22x22/edit-clear.png");
|
|
- EditText .addFile(":/ico/22x22/names.png");
|
|
- adding_image .addFile(":/ico/22x22/insert-image.png");
|
|
-
|
|
- if (rtl) {
|
|
- EditClearLocationBar.addPixmap(QPixmap(":/ico/16x16/edit-clear-locationbar-ltr.png").transformed(reverse));
|
|
- EditClearLocationBar.addPixmap(QPixmap(":/ico/22x22/edit-clear-locationbar-ltr.png").transformed(reverse));
|
|
- } else {
|
|
- EditClearLocationBar.addFile(":/ico/16x16/edit-clear-locationbar-ltr.png");
|
|
- EditClearLocationBar.addFile(":/ico/22x22/edit-clear-locationbar-ltr.png");
|
|
- }
|
|
- EditCopy .addFile(":/ico/16x16/edit-copy.png");
|
|
- EditCopy .addFile(":/ico/22x22/edit-copy.png");
|
|
- EditCut .addFile(":/ico/16x16/edit-cut.png");
|
|
- EditCut .addFile(":/ico/22x22/edit-cut.png");
|
|
- EditDelete .addFile(":/ico/16x16/edit-delete.png");
|
|
- EditDelete .addFile(":/ico/22x22/edit-delete.png");
|
|
- EditPaste .addFile(":/ico/22x22/edit-paste.png");
|
|
- EditPaste .addFile(":/ico/16x16/edit-paste.png");
|
|
- if (rtl) {
|
|
- EditRedo.addPixmap(QPixmap(":/ico/16x16/edit-redo.png").transformed(reverse));
|
|
- EditRedo.addPixmap(QPixmap(":/ico/22x22/edit-redo.png").transformed(reverse));
|
|
- } else {
|
|
- EditRedo .addFile(":/ico/16x16/edit-redo.png");
|
|
- EditRedo .addFile(":/ico/22x22/edit-redo.png");
|
|
- }
|
|
- EditRename .addFile(":/ico/16x16/edit-rename.png");
|
|
- EditRename .addFile(":/ico/22x22/edit-rename.png");
|
|
- EditSelectAll .addFile(":/ico/16x16/edit-select-all.png");
|
|
- EditSelectAll .addFile(":/ico/22x22/edit-select-all.png");
|
|
- EditSelectInvert .addFile(":/ico/16x16/edit-select-invert.png");
|
|
- EditSelectNone .addFile(":/ico/16x16/edit-select-none.png");
|
|
+ EditClear = QIcon::fromTheme("edit-clear");
|
|
+ EditText = QIcon::fromTheme("edittext");
|
|
+ adding_image = QIcon::fromTheme("insert-image");
|
|
+ EditClearLocationBar= QIcon::fromTheme("edit-clear-locationbar-ltr");
|
|
+ EditCopy = QIcon::fromTheme("edit-copy");
|
|
+ EditCut = QIcon::fromTheme("edit-cut");
|
|
+ EditDelete = QIcon::fromTheme("edit-delete");
|
|
+ EditPaste = QIcon::fromTheme("edit-paste");
|
|
+ EditRedo = QIcon::fromTheme("edit-redo");
|
|
+ EditRename = QIcon::fromTheme("edit-rename");
|
|
+ EditSelectAll = QIcon::fromTheme("edit-select-all");
|
|
+ EditSelectInvert = QIcon::fromTheme("edit-select-invert");
|
|
+ EditSelectNone = QIcon::fromTheme("edit-select-none");
|
|
EditTableCellMerge .addFile(":/ico/16x16/edit-table-cell-merge.png");
|
|
EditTableCellMerge .addFile(":/ico/22x22/edit-table-cell-merge.png");
|
|
EditTableCellSplit .addFile(":/ico/16x16/edit-table-cell-split.png");
|
|
@@ -341,13 +299,7 @@ void QET::Icons::initIcons() {
|
|
EditTableInsertRowAbove .addFile(":/ico/22x22/edit-table-insert-row-above.png");
|
|
EditTableInsertRowUnder .addFile(":/ico/16x16/edit-table-insert-row-under.png");
|
|
EditTableInsertRowUnder .addFile(":/ico/22x22/edit-table-insert-row-under.png");
|
|
- if (rtl) {
|
|
- EditUndo.addPixmap(QPixmap(":/ico/16x16/edit-undo.png").transformed(reverse));
|
|
- EditUndo.addPixmap(QPixmap(":/ico/22x22/edit-undo.png").transformed(reverse));
|
|
- } else {
|
|
- EditUndo .addFile(":/ico/16x16/edit-undo.png");
|
|
- EditUndo .addFile(":/ico/22x22/edit-undo.png");
|
|
- }
|
|
+ EditUndo = QIcon::fromTheme("edit-undo");
|
|
Element .addFile(":/ico/breeze-icons/16x16/mimetypes/application-x-qet-element.png");
|
|
Element .addFile(":/ico/breeze-icons/22x22/mimetypes/application-x-qet-element.png");
|
|
Element .addFile(":/ico/breeze-icons/32x32/mimetypes/application-x-qet-element.png");
|
|
@@ -364,83 +316,71 @@ void QET::Icons::initIcons() {
|
|
EndLineSimple .addFile(":/ico/16x16/endline-simple.png");
|
|
EndLineTriangle .addFile(":/ico/16x16/endline-triangle.png");
|
|
EPS .addFile(":/ico/32x32/image-x-eps.png");
|
|
- Folder .addFile(":/ico/16x16/folder.png");
|
|
+ Folder = QIcon(QIcon::fromTheme("folder").pixmap(QSize(22,22)));
|
|
FolderDelete .addFile(":/ico/16x16/folder-delete.png");
|
|
FolderDelete .addFile(":/ico/22x22/folder-delete.png");
|
|
FolderEdit .addFile(":/ico/16x16/folder-edit.png");
|
|
FolderEdit .addFile(":/ico/22x22/folder-edit.png");
|
|
- FolderNew .addFile(":/ico/16x16/folder-new.png");
|
|
- FolderNew .addFile(":/ico/22x22/folder-new.png");
|
|
+ FolderNew = QIcon::fromTheme("folder-new");
|
|
FolderOnlyThis .addFile(":/ico/16x16/folder-only-this.png");
|
|
- FolderOpen .addFile(":/ico/16x16/folder-open.png");
|
|
- FolderOpen .addFile(":/ico/22x22/folder-open.png");
|
|
- FolderProperties .addFile(":/ico/16x16/folder-properties.png");
|
|
+ FolderOpen = QIcon::fromTheme("document-open-folder");
|
|
+ FolderProperties = QIcon::fromTheme("document-properties");
|
|
FolderShowAll .addFile(":/ico/16x16/folder-show-all.png");
|
|
- Forbidden .addFile(":/ico/16x16/user-busy.png");
|
|
- FullScreenEnter .addFile(":/ico/16x16/view-fullscreen.png");
|
|
- FullScreenEnter .addFile(":/ico/22x22/view-fullscreen.png");
|
|
- FullScreenExit .addFile(":/ico/16x16/view-restore.png");
|
|
- FullScreenExit .addFile(":/ico/22x22/view-restore.png");
|
|
- GoBottom .addFile(":/ico/16x16/go-bottom.png");
|
|
- GoDown .addFile(":/ico/16x16/go-down.png");
|
|
- GoDown .addFile(":/ico/22x22/go-down.png");
|
|
- GoDownDouble .addFile(":/ico/16x16/go-down-double.png");
|
|
- GoTop .addFile(":/ico/16x16/go-top.png");
|
|
- GoUp .addFile(":/ico/16x16/go-up.png");
|
|
- GoUp .addFile(":/ico/22x22/go-up.png");
|
|
- GoUpDouble .addFile(":/ico/16x16/go-up-double.png");
|
|
+ Forbidden = QIcon::fromTheme("user-busy");
|
|
+ FullScreenEnter = QIcon::fromTheme("view-fullscreen");
|
|
+ FullScreenExit = QIcon::fromTheme("view-restore");
|
|
+ GoBottom = QIcon::fromTheme("go-bottom");
|
|
+ GoDown = QIcon::fromTheme("go-down");
|
|
+ GoDownDouble = QIcon::fromTheme("go-down-double");
|
|
+ GoTop = QIcon::fromTheme("go-top");
|
|
+ GoUp = QIcon::fromTheme("go-up");
|
|
+ GoUpDouble = QIcon::fromTheme("go-up-double");
|
|
Ground .addFile(":/ico/16x16/ground.png");
|
|
Grid .addFile(":/ico/16x16/grid.png");
|
|
Grid .addFile(":/ico/22x22/grid.png");
|
|
- Hide .addFile(":/ico/16x16/masquer.png");
|
|
- Home .addFile(":/ico/16x16/go-home.png");
|
|
- Home .addFile(":/ico/22x22/go-home.png");
|
|
+ Hide = QIcon::fromTheme("hide");
|
|
+ Home = QIcon::fromTheme("go-home");
|
|
HotSpot .addFile(":/ico/22x22/hotspot.png");
|
|
- InsertImage .addFile(":/ico/22x22/insert-image.png");
|
|
+ InsertImage = QIcon::fromTheme("insert-image");
|
|
Lower .addFile(":/ico/22x22/lower.png");
|
|
IC_MoveFile .addFile(":/ico/16x16/item-move.png");
|
|
Names .addFile(":/ico/22x22/names.png");
|
|
Neutral .addFile(":/ico/16x16/neutral.png");
|
|
NewDiagram .addFile(":/ico/128x128/diagram.png");
|
|
North .addFile(":/ico/16x16/north.png");
|
|
- ObjectLocked .addFile(":/ico/22x22/object-locked.png");
|
|
- ObjectRotateRight .addFile(":/ico/16x16/object-rotate-right.png");
|
|
- ObjectRotateRight .addFile(":/ico/22x22/object-rotate-right.png");
|
|
- ObjectUnlocked .addFile(":/ico/22x22/object-unlocked.png");
|
|
+ ObjectLocked = QIcon::fromTheme("lock");
|
|
+ ObjectRotateRight = QIcon::fromTheme("object-rotate-right");
|
|
+ ObjectUnlocked = QIcon::fromTheme("unlock");
|
|
Orientations .addFile(":/ico/16x16/orientations.png");
|
|
PartArc .addFile(":/ico/22x22/arc.png");
|
|
- PartCircle .addFile(":/ico/16x16/circle.png");
|
|
- PartEllipse .addFile(":/ico/22x22/ellipse.png");
|
|
- PartLine .addFile(":/ico/22x22/line.png");
|
|
- PartPolygon .addFile(":/ico/22x22/polygon.png");
|
|
- PartRectangle .addFile(":/ico/22x22/rectangle.png");
|
|
- PartSelect .addFile(":/ico/16x16/select.png");
|
|
- PartSelect .addFile(":/ico/22x22/select.png");
|
|
- PartText .addFile(":/ico/22x22/text.png");
|
|
- PartTextField .addFile(":/ico/22x22/textfield.png");
|
|
- PDF .addFile(":/ico/32x32/application-pdf.png");
|
|
+ PartCircle = QIcon::fromTheme("draw-circle");
|
|
+ PartEllipse = QIcon::fromTheme("draw-ellipse");
|
|
+ PartLine = QIcon::fromTheme("draw-line");
|
|
+ PartPolygon = QIcon::fromTheme("draw-polygon");
|
|
+ PartRectangle = QIcon::fromTheme("draw-rectangle");
|
|
+ PartSelect = QIcon::fromTheme("select");
|
|
+ PartText = QIcon::fromTheme("draw-text");
|
|
+ PartTextField = QIcon::fromTheme("text-field");
|
|
+ PDF = QIcon::fromTheme("application-pdf");
|
|
Phase .addFile(":/ico/16x16/phase.png");
|
|
PrintAllPages .addFile(":/ico/22x22/all_pages.png");
|
|
- Printer .addFile(":/ico/32x32/printer.png");
|
|
- Printer .addFile(":/ico/128x128/printer.png");
|
|
+ Printer = QIcon::fromTheme("printer");
|
|
PrintLandscape .addFile(":/ico/22x22/landscape.png");
|
|
PrintPortrait .addFile(":/ico/22x22/portrait.png");
|
|
PrintTwoPages .addFile(":/ico/22x22/two_pages.png");
|
|
Projects .addFile(":/ico/128x128/project.png");
|
|
- ProjectClose .addFile(":/ico/16x16/project-close.png");
|
|
- ProjectClose .addFile(":/ico/22x22/project-close.png");
|
|
- ProjectNew .addFile(":/ico/16x16/project-new.png");
|
|
- ProjectNew .addFile(":/ico/22x22/project-new.png");
|
|
+ ProjectClose = QIcon::fromTheme("document-close");
|
|
+ ProjectNew = QIcon::fromTheme("document-new");
|
|
ProjectFile .addFile(":/ico/breeze-icons/16x16/mimetypes/application-x-qet-project.png");
|
|
ProjectFile .addFile(":/ico/breeze-icons/22x22/mimetypes/application-x-qet-project.png");
|
|
ProjectFile .addFile(":/ico/breeze-icons/32x32/mimetypes/application-x-qet-project.png");
|
|
- ProjectProperties .addFile(":/ico/16x16/project-properties.png");
|
|
- QETDonate .addFile(":/ico/16x16/help-donate.png");
|
|
- QETDownload .addFile(":/ico/16x16/edit-download.png");
|
|
+ ProjectProperties = QIcon::fromTheme("configure_project");
|
|
+ QETDonate = QIcon::fromTheme("help-donate");
|
|
+ QETDownload = QIcon::fromTheme("edit-download");
|
|
QETIcon .addFile(":/ico/256x256/qelectrotech.png");
|
|
- ProjectFileGP .addFile(":/ico/16x16/project.png");
|
|
+ ProjectFileGP = QIcon(QIcon::fromTheme("folder-text").pixmap(QSize(22,22)));
|
|
QETLogo .addFile(":/ico/16x16/qet.png");
|
|
- QETManual .addFile(":/ico/16x16/help-contents.png");
|
|
+ QETManual = QIcon::fromTheme("help-contents");
|
|
QETLogo .addFile(":/ico/256x256/qet.png");
|
|
QETOxygenLogo .addFile(":/ico/breeze-icons/128x128/apps/qelectrotech.png");
|
|
QETOxygenLogo .addFile(":/ico/breeze-icons/16x16/apps/qelectrotech.png");
|
|
@@ -452,54 +392,37 @@ void QET::Icons::initIcons() {
|
|
QETVideo .addFile(":/ico/16x16/kdenlive-show-video.png");
|
|
QtLogo .addFile(":/ico/16x16/qt.png");
|
|
Raise .addFile(":/ico/22x22/raise.png");
|
|
- Remove .addFile(":/ico/16x16/list-remove.png");
|
|
- Remove .addFile(":/ico/22x22/list-remove.png");
|
|
+ Remove = QIcon::fromTheme("list-remove");
|
|
resize_image .addFile(":/ico/22x22/transform-scale.png");
|
|
- Restore .addFile(":/ico/22x22/restaurer.png");
|
|
+ Restore = QIcon::fromTheme("redeyes");
|
|
RunDxf .addFile(":/ico/16x16/run-dxf.png");
|
|
SendBackward .addFile(":/ico/22x22/send_backward.png");
|
|
- Settings .addFile(":/ico/128x128/settings.png");
|
|
+ Settings = QIcon::fromTheme("settings");
|
|
SinglePage .addFile(":/ico/22x22/single_page.png");
|
|
South .addFile(":/ico/16x16/south.png");
|
|
- Start .addFile(":/ico/22x22/start.png");
|
|
+ Start = QIcon::fromTheme("kt-start");
|
|
TableOfContent .addFile(":/ico/16x16/table-of-content.png");
|
|
+ Terminal .addFile(":/ico/16x16/terminal.png");
|
|
Terminal .addFile(":/ico/22x22/terminal.png");
|
|
TerminalStrip .addFile(":/ico/16x16/terminalstrip.png");
|
|
TerminalStrip .addFile(":/ico/22x22/terminalstrip.png");
|
|
- TitleBlock .addFile(":/ico/16x16/label.png");
|
|
- TitleBlock .addFile(":/ico/22x22/label.png");
|
|
+ TitleBlock = QIcon::fromTheme("label");
|
|
TitleBlockBottom .addFile(":/ico/22x22/titleblock-bottom.png");
|
|
TitleBlockRight .addFile(":/ico/22x22/titleblock-right.png");
|
|
- TransformRotate .addFile(":/ico/16x16/transform-rotate.png");
|
|
- UserInformations .addFile(":/ico/16x16/preferences-desktop-user.png");
|
|
- UserInformations .addFile(":/ico/22x22/preferences-desktop-user.png");
|
|
- ViewFitWidth .addFile(":/ico/22x22/view_fit_width.png");
|
|
- ViewFitWindow .addFile(":/ico/22x22/view-fit-window.png");
|
|
- ViewMove .addFile(":/ico/16x16/move.png");
|
|
- ViewMove .addFile(":/ico/22x22/move.png");
|
|
- if (rtl) {
|
|
- ViewRefresh.addPixmap(QPixmap(":/ico/16x16/view-refresh.png").transformed(reverse));
|
|
- ViewRefresh.addPixmap(QPixmap(":/ico/22x22/view-refresh.png").transformed(reverse));
|
|
- } else {
|
|
- ViewRefresh .addFile(":/ico/16x16/view-refresh.png");
|
|
- ViewRefresh .addFile(":/ico/22x22/view-refresh.png");
|
|
- }
|
|
+ TransformRotate = QIcon::fromTheme("transform-rotate");
|
|
+ UserInformations = QIcon::fromTheme("preferences-desktop-user");
|
|
+ ViewFitWidth = QIcon::fromTheme("zoom-fit-width");
|
|
+ ViewFitWindow = QIcon::fromTheme("window");
|
|
+ ViewMove = QIcon::fromTheme("hand");
|
|
+ ViewRefresh = QIcon::fromTheme("view-refresh");
|
|
West .addFile(":/ico/16x16/west.png");
|
|
- WindowNew .addFile(":/ico/16x16/window-new.png");
|
|
- WindowNew .addFile(":/ico/22x22/window-new.png");
|
|
- XmlTextFile .addFile(":/ico/16x16/text-xml.png");
|
|
- XmlTextFile .addFile(":/ico/22x22/text-xml.png");
|
|
- XmlTextFile .addFile(":/ico/32x32/text-xml.png");
|
|
- ZoomDraw .addFile(":/ico/16x16/zoom-draw.png");
|
|
- ZoomDraw .addFile(":/ico/22x22/zoom-draw.png");
|
|
- ZoomFitBest .addFile(":/ico/16x16/zoom-fit-best.png");
|
|
- ZoomFitBest .addFile(":/ico/22x22/zoom-fit-best.png");
|
|
- ZoomIn .addFile(":/ico/16x16/zoom-in.png");
|
|
- ZoomIn .addFile(":/ico/22x22/zoom-in.png");
|
|
- ZoomOriginal .addFile(":/ico/16x16/zoom-original.png");
|
|
- ZoomOriginal .addFile(":/ico/22x22/zoom-original.png");
|
|
- ZoomOut .addFile(":/ico/16x16/zoom-out.png");
|
|
- ZoomOut .addFile(":/ico/22x22/zoom-out.png");
|
|
+ WindowNew = QIcon::fromTheme("window-new");
|
|
+ XmlTextFile = QIcon::fromTheme("format-text-code");
|
|
+ ZoomDraw = QIcon::fromTheme("zoom-draw");
|
|
+ ZoomFitBest = QIcon::fromTheme("zoom-fit-width");
|
|
+ ZoomIn = QIcon::fromTheme("zoom-in");
|
|
+ ZoomOriginal = QIcon::fromTheme("zoom-original");
|
|
+ ZoomOut = QIcon::fromTheme("zoom-out");
|
|
ar .addFile(":/ico/24x16/ar.png");
|
|
br .addFile(":/ico/24x16/br.png");
|
|
catalonia .addFile(":/ico/24x16/catalonia.png");
|
|
@@ -522,10 +445,10 @@ void QET::Icons::initIcons() {
|
|
be .addFile(":/ico/24x16/be.png");
|
|
tr .addFile(":/ico/24x16/tr.png");
|
|
translation .addFile(":/ico/22x22/applications-development-translation.png");
|
|
- listDrawings .addFile(":/ico/48x48/view-pim-journal.png");
|
|
+ listDrawings = QIcon::fromTheme("format-list-unordered");
|
|
AutoNum .addFile(":/ico/128x128/plasmagik.png");
|
|
- sub .addFile(":/ico/22x22/format-text-subscript.png");
|
|
- super .addFile(":/ico/22x22/format-text-superscript.png");
|
|
+ sub = QIcon::fromTheme("format-text-subscript");
|
|
+ super = QIcon::fromTheme("format-text-superscript");
|
|
textGroup .addFile(":/ico/16x16/object-group.png");
|
|
ElementMaster .addFile(":/ico/16x16/element-master.png");
|
|
ElementSlave .addFile(":/ico/16x16/element-slave.png");
|
|
--
|
|
2.23.0
|
|
|