diff --git a/qucs/bitmaps/RemoveElementTuning.png b/qucs/bitmaps/RemoveElementTuning.png
deleted file mode 100644
index ac5e7076b..000000000
Binary files a/qucs/bitmaps/RemoveElementTuning.png and /dev/null differ
diff --git a/qucs/bitmaps/bottom.png b/qucs/bitmaps/bottom.png
deleted file mode 100644
index f8c271f96..000000000
Binary files a/qucs/bitmaps/bottom.png and /dev/null differ
diff --git a/qucs/bitmaps/deactiv.png b/qucs/bitmaps/deactiv.png
deleted file mode 100644
index 741754316..000000000
Binary files a/qucs/bitmaps/deactiv.png and /dev/null differ
diff --git a/qucs/bitmaps/editcopy.png b/qucs/bitmaps/editcopy.png
deleted file mode 100644
index eac4d8c93..000000000
Binary files a/qucs/bitmaps/editcopy.png and /dev/null differ
diff --git a/qucs/bitmaps/editcut.png b/qucs/bitmaps/editcut.png
deleted file mode 100644
index 192b5757a..000000000
Binary files a/qucs/bitmaps/editcut.png and /dev/null differ
diff --git a/qucs/bitmaps/editdelete.png b/qucs/bitmaps/editdelete.png
deleted file mode 100644
index 6fb193f06..000000000
Binary files a/qucs/bitmaps/editdelete.png and /dev/null differ
diff --git a/qucs/bitmaps/editpaste.png b/qucs/bitmaps/editpaste.png
deleted file mode 100644
index b8454f91d..000000000
Binary files a/qucs/bitmaps/editpaste.png and /dev/null differ
diff --git a/qucs/bitmaps/fileclose.png b/qucs/bitmaps/fileclose.png
deleted file mode 100644
index 7cb985935..000000000
Binary files a/qucs/bitmaps/fileclose.png and /dev/null differ
diff --git a/qucs/bitmaps/filenew.png b/qucs/bitmaps/filenew.png
deleted file mode 100644
index 7be37e89a..000000000
Binary files a/qucs/bitmaps/filenew.png and /dev/null differ
diff --git a/qucs/bitmaps/fileopen.png b/qucs/bitmaps/fileopen.png
index a79982ea1..3332d78a9 100644
Binary files a/qucs/bitmaps/fileopen.png and b/qucs/bitmaps/fileopen.png differ
diff --git a/qucs/bitmaps/fileprint.png b/qucs/bitmaps/fileprint.png
deleted file mode 100644
index 976c59e62..000000000
Binary files a/qucs/bitmaps/fileprint.png and /dev/null differ
diff --git a/qucs/bitmaps/filesave.png b/qucs/bitmaps/filesave.png
deleted file mode 100644
index a70be4e64..000000000
Binary files a/qucs/bitmaps/filesave.png and /dev/null differ
diff --git a/qucs/bitmaps/filesaveall.png b/qucs/bitmaps/filesaveall.png
deleted file mode 100644
index b59371116..000000000
Binary files a/qucs/bitmaps/filesaveall.png and /dev/null differ
diff --git a/qucs/bitmaps/gear.png b/qucs/bitmaps/gear.png
deleted file mode 100644
index 129b4c9a8..000000000
Binary files a/qucs/bitmaps/gear.png and /dev/null differ
diff --git a/qucs/bitmaps/marker.png b/qucs/bitmaps/marker.png
deleted file mode 100644
index 4c949867e..000000000
Binary files a/qucs/bitmaps/marker.png and /dev/null differ
diff --git a/qucs/bitmaps/mirror.png b/qucs/bitmaps/mirror.png
deleted file mode 100644
index a87dbdf17..000000000
Binary files a/qucs/bitmaps/mirror.png and /dev/null differ
diff --git a/qucs/bitmaps/mirrory.png b/qucs/bitmaps/mirrory.png
deleted file mode 100644
index f199bffa5..000000000
Binary files a/qucs/bitmaps/mirrory.png and /dev/null differ
diff --git a/qucs/bitmaps/nodename.png b/qucs/bitmaps/nodename.png
deleted file mode 100644
index 3a19fafec..000000000
Binary files a/qucs/bitmaps/nodename.png and /dev/null differ
diff --git a/qucs/bitmaps/pointer.png b/qucs/bitmaps/pointer.png
deleted file mode 100644
index e8ef2d54e..000000000
Binary files a/qucs/bitmaps/pointer.png and /dev/null differ
diff --git a/qucs/bitmaps/rebuild.png b/qucs/bitmaps/rebuild.png
deleted file mode 100644
index 9f182b3ca..000000000
Binary files a/qucs/bitmaps/rebuild.png and /dev/null differ
diff --git a/qucs/bitmaps/rotate_ccw.png b/qucs/bitmaps/rotate_ccw.png
deleted file mode 100644
index efe845713..000000000
Binary files a/qucs/bitmaps/rotate_ccw.png and /dev/null differ
diff --git a/qucs/bitmaps/svg/bottom.svg b/qucs/bitmaps/svg/bottom.svg
new file mode 100644
index 000000000..db11c445e
--- /dev/null
+++ b/qucs/bitmaps/svg/bottom.svg
@@ -0,0 +1,71 @@
+
+
+
diff --git a/qucs/bitmaps/svg/deactiv.svg b/qucs/bitmaps/svg/deactiv.svg
new file mode 100644
index 000000000..bbf016af4
--- /dev/null
+++ b/qucs/bitmaps/svg/deactiv.svg
@@ -0,0 +1,178 @@
+
+
+
+
diff --git a/qucs/bitmaps/svg/editcopy.svg b/qucs/bitmaps/svg/editcopy.svg
new file mode 100644
index 000000000..5f480b66f
--- /dev/null
+++ b/qucs/bitmaps/svg/editcopy.svg
@@ -0,0 +1,53 @@
+
+
+
diff --git a/qucs/bitmaps/svg/editcut.svg b/qucs/bitmaps/svg/editcut.svg
new file mode 100644
index 000000000..8340d6b3d
--- /dev/null
+++ b/qucs/bitmaps/svg/editcut.svg
@@ -0,0 +1,90 @@
+
+
\ No newline at end of file
diff --git a/qucs/bitmaps/svg/editdelete.svg b/qucs/bitmaps/svg/editdelete.svg
new file mode 100644
index 000000000..fef715e67
--- /dev/null
+++ b/qucs/bitmaps/svg/editdelete.svg
@@ -0,0 +1,83 @@
+
+
\ No newline at end of file
diff --git a/qucs/bitmaps/svg/editpaste.svg b/qucs/bitmaps/svg/editpaste.svg
new file mode 100644
index 000000000..e50d3c2f3
--- /dev/null
+++ b/qucs/bitmaps/svg/editpaste.svg
@@ -0,0 +1,421 @@
+
+
+
diff --git a/qucs/bitmaps/svg/editredo.svg b/qucs/bitmaps/svg/editredo.svg
new file mode 100644
index 000000000..6ed53469e
--- /dev/null
+++ b/qucs/bitmaps/svg/editredo.svg
@@ -0,0 +1,36 @@
+
+
\ No newline at end of file
diff --git a/qucs/bitmaps/svg/editundo.svg b/qucs/bitmaps/svg/editundo.svg
new file mode 100644
index 000000000..a7e813189
--- /dev/null
+++ b/qucs/bitmaps/svg/editundo.svg
@@ -0,0 +1,29 @@
+
+
\ No newline at end of file
diff --git a/qucs/bitmaps/svg/equation.svg b/qucs/bitmaps/svg/equation.svg
new file mode 100644
index 000000000..ee778e3c2
--- /dev/null
+++ b/qucs/bitmaps/svg/equation.svg
@@ -0,0 +1,164 @@
+
+
+
+
diff --git a/qucs/bitmaps/svg/error.svg b/qucs/bitmaps/svg/error.svg
new file mode 100644
index 000000000..406c6f7fc
--- /dev/null
+++ b/qucs/bitmaps/svg/error.svg
@@ -0,0 +1,108 @@
+
+
\ No newline at end of file
diff --git a/qucs/bitmaps/svg/fileclose.svg b/qucs/bitmaps/svg/fileclose.svg
new file mode 100644
index 000000000..c9917d4fb
--- /dev/null
+++ b/qucs/bitmaps/svg/fileclose.svg
@@ -0,0 +1,460 @@
+
+
+
+
\ No newline at end of file
diff --git a/qucs/bitmaps/svg/filenew.svg b/qucs/bitmaps/svg/filenew.svg
new file mode 100644
index 000000000..19034574b
--- /dev/null
+++ b/qucs/bitmaps/svg/filenew.svg
@@ -0,0 +1,432 @@
+
+
diff --git a/qucs/bitmaps/svg/fileprint.svg b/qucs/bitmaps/svg/fileprint.svg
new file mode 100644
index 000000000..295f660e5
--- /dev/null
+++ b/qucs/bitmaps/svg/fileprint.svg
@@ -0,0 +1,249 @@
+
+
+
diff --git a/qucs/bitmaps/svg/filesave.svg b/qucs/bitmaps/svg/filesave.svg
new file mode 100644
index 000000000..149eaa17a
--- /dev/null
+++ b/qucs/bitmaps/svg/filesave.svg
@@ -0,0 +1,144 @@
+
+
\ No newline at end of file
diff --git a/qucs/bitmaps/svg/filesaveall.svg b/qucs/bitmaps/svg/filesaveall.svg
new file mode 100644
index 000000000..f68839e93
--- /dev/null
+++ b/qucs/bitmaps/svg/filesaveall.svg
@@ -0,0 +1,4846 @@
+
+
+
diff --git a/qucs/bitmaps/svg/gear.svg b/qucs/bitmaps/svg/gear.svg
new file mode 100644
index 000000000..dd77b7e49
--- /dev/null
+++ b/qucs/bitmaps/svg/gear.svg
@@ -0,0 +1,182 @@
+
+
+
diff --git a/qucs/bitmaps/svg/ground.svg b/qucs/bitmaps/svg/ground.svg
new file mode 100644
index 000000000..b3f731e92
--- /dev/null
+++ b/qucs/bitmaps/svg/ground.svg
@@ -0,0 +1,153 @@
+
+
+
+
diff --git a/qucs/bitmaps/svg/marker.svg b/qucs/bitmaps/svg/marker.svg
new file mode 100644
index 000000000..8681d77db
--- /dev/null
+++ b/qucs/bitmaps/svg/marker.svg
@@ -0,0 +1,173 @@
+
+
+
+
diff --git a/qucs/bitmaps/svg/mirror.svg b/qucs/bitmaps/svg/mirror.svg
new file mode 100644
index 000000000..e0d3d46b0
--- /dev/null
+++ b/qucs/bitmaps/svg/mirror.svg
@@ -0,0 +1,60 @@
+
+
+
diff --git a/qucs/bitmaps/svg/mirrory.svg b/qucs/bitmaps/svg/mirrory.svg
new file mode 100644
index 000000000..39c70702b
--- /dev/null
+++ b/qucs/bitmaps/svg/mirrory.svg
@@ -0,0 +1,62 @@
+
+
+
diff --git a/qucs/bitmaps/svg/nodename.svg b/qucs/bitmaps/svg/nodename.svg
new file mode 100644
index 000000000..179627d0c
--- /dev/null
+++ b/qucs/bitmaps/svg/nodename.svg
@@ -0,0 +1,162 @@
+
+
+
+
diff --git a/qucs/bitmaps/svg/ok_apply.svg b/qucs/bitmaps/svg/ok_apply.svg
new file mode 100644
index 000000000..e7ebd6dfb
--- /dev/null
+++ b/qucs/bitmaps/svg/ok_apply.svg
@@ -0,0 +1,72 @@
+
+
+
diff --git a/qucs/bitmaps/svg/pointer.svg b/qucs/bitmaps/svg/pointer.svg
new file mode 100644
index 000000000..7bd782739
--- /dev/null
+++ b/qucs/bitmaps/svg/pointer.svg
@@ -0,0 +1,308 @@
+
+
+
+
diff --git a/qucs/bitmaps/svg/port.svg b/qucs/bitmaps/svg/port.svg
new file mode 100644
index 000000000..52a6b0bb5
--- /dev/null
+++ b/qucs/bitmaps/svg/port.svg
@@ -0,0 +1,150 @@
+
+
+
+
diff --git a/qucs/bitmaps/svg/rebuild.svg b/qucs/bitmaps/svg/rebuild.svg
new file mode 100644
index 000000000..4448ac4a6
--- /dev/null
+++ b/qucs/bitmaps/svg/rebuild.svg
@@ -0,0 +1,1191 @@
+
+
+
+
diff --git a/qucs/bitmaps/svg/rotate_ccw.svg b/qucs/bitmaps/svg/rotate_ccw.svg
new file mode 100644
index 000000000..1235a9029
--- /dev/null
+++ b/qucs/bitmaps/svg/rotate_ccw.svg
@@ -0,0 +1,51 @@
+
+
+
diff --git a/qucs/bitmaps/svg/textnew.svg b/qucs/bitmaps/svg/textnew.svg
new file mode 100644
index 000000000..9b6e46e4e
--- /dev/null
+++ b/qucs/bitmaps/svg/textnew.svg
@@ -0,0 +1,446 @@
+
+
diff --git a/qucs/bitmaps/svg/top.svg b/qucs/bitmaps/svg/top.svg
new file mode 100644
index 000000000..1699f4997
--- /dev/null
+++ b/qucs/bitmaps/svg/top.svg
@@ -0,0 +1,76 @@
+
+
+
diff --git a/qucs/bitmaps/svg/tune.svg b/qucs/bitmaps/svg/tune.svg
new file mode 100644
index 000000000..7481a05dc
--- /dev/null
+++ b/qucs/bitmaps/svg/tune.svg
@@ -0,0 +1,847 @@
+
+
+
diff --git a/qucs/bitmaps/svg/wire.svg b/qucs/bitmaps/svg/wire.svg
new file mode 100644
index 000000000..5839e7a5b
--- /dev/null
+++ b/qucs/bitmaps/svg/wire.svg
@@ -0,0 +1,150 @@
+
+
+
+
diff --git a/qucs/bitmaps/textnew.png b/qucs/bitmaps/textnew.png
deleted file mode 100644
index bd842ebd0..000000000
Binary files a/qucs/bitmaps/textnew.png and /dev/null differ
diff --git a/qucs/bitmaps/top.png b/qucs/bitmaps/top.png
deleted file mode 100644
index c4756bdd2..000000000
Binary files a/qucs/bitmaps/top.png and /dev/null differ
diff --git a/qucs/bitmaps/tune.png b/qucs/bitmaps/tune.png
deleted file mode 100644
index e90eb203b..000000000
Binary files a/qucs/bitmaps/tune.png and /dev/null differ
diff --git a/qucs/bitmaps/viewmag+.png b/qucs/bitmaps/viewmag+.png
index df1f1a9ad..46ccbe45c 100644
Binary files a/qucs/bitmaps/viewmag+.png and b/qucs/bitmaps/viewmag+.png differ
diff --git a/qucs/bitmaps/viewmag-.png b/qucs/bitmaps/viewmag-.png
index 7ecf08f5d..1de478ba8 100644
Binary files a/qucs/bitmaps/viewmag-.png and b/qucs/bitmaps/viewmag-.png differ
diff --git a/qucs/bitmaps/viewmag1.png b/qucs/bitmaps/viewmag1.png
index e09aa1e9f..90b7341c9 100644
Binary files a/qucs/bitmaps/viewmag1.png and b/qucs/bitmaps/viewmag1.png differ
diff --git a/qucs/bitmaps/viewmagfit.png b/qucs/bitmaps/viewmagfit.png
index 4d8b0610f..a062e547a 100644
Binary files a/qucs/bitmaps/viewmagfit.png and b/qucs/bitmaps/viewmagfit.png differ
diff --git a/qucs/bitmaps/wire.png b/qucs/bitmaps/wire.png
deleted file mode 100644
index 76e27b71a..000000000
Binary files a/qucs/bitmaps/wire.png and /dev/null differ
diff --git a/qucs/dialogs/tuner.cpp b/qucs/dialogs/tuner.cpp
index 8a249f5c7..5287aa5b4 100644
--- a/qucs/dialogs/tuner.cpp
+++ b/qucs/dialogs/tuner.cpp
@@ -193,10 +193,7 @@ tunerElement::tunerElement(QWidget *parent, Component *component, Property *pp,
QPushButton *remove = new QPushButton("", this);
gbox->addWidget(remove, 0, 2);
- QPixmap pixmap(":/bitmaps/RemoveElementTuning.png");
- QIcon ButtonIcon(pixmap);
- remove->setIcon(ButtonIcon);
- remove->setIconSize(pixmap.rect().size()/2);
+ remove->setIcon(QIcon(":/bitmaps/svg/editdelete.svg"));
Up_Down_Buttons_Widget = new QWidget();
QGridLayout *buttonsLayout = new QGridLayout();
diff --git a/qucs/extsimkernels/externsimdialog.cpp b/qucs/extsimkernels/externsimdialog.cpp
index d7226de25..918d22dcc 100644
--- a/qucs/extsimkernels/externsimdialog.cpp
+++ b/qucs/extsimkernels/externsimdialog.cpp
@@ -190,7 +190,7 @@ void ExternSimDialog::slotProcessOutput()
emit warnings();
} else {
addLogEntry(tr("Simulation successful. Now place diagram on schematic to plot the result."),
- QIcon(":/bitmaps/tick.png"));
+ QIcon(":/bitmaps/svg/ok_apply.svg"));
emit success();
}
//editSimConsole->clear();
diff --git a/qucs/main.cpp b/qucs/main.cpp
index f99d42cab..32b28eaae 100644
--- a/qucs/main.cpp
+++ b/qucs/main.cpp
@@ -952,6 +952,9 @@ int main(int argc, char *argv[])
QucsSettings.sysDefaultFont = QApplication::font();
a.setFont(QucsSettings.appFont);
a.setAttribute(Qt::AA_EnableHighDpiScaling,true);
+#if QT_VERSION < 0x060000
+ a.setAttribute(Qt::AA_UseHighDpiPixmaps,true);
+#endif
// set codecs
//QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
diff --git a/qucs/messagedock.cpp b/qucs/messagedock.cpp
index cf6de5420..dd6a3ff81 100644
--- a/qucs/messagedock.cpp
+++ b/qucs/messagedock.cpp
@@ -137,9 +137,9 @@ void MessageDock::slotAdmsChanged()
// Change adms tab icon
if (error)
- builderTabs->setTabIcon(0,QPixmap(":/bitmaps/error.png"));
+ builderTabs->setTabIcon(0,QPixmap(":/bitmaps/svg/error.svg"));
else
- builderTabs->setTabIcon(0,QPixmap(":/bitmaps/tick.png"));
+ builderTabs->setTabIcon(0,QPixmap(":/bitmaps/svg/ok_apply.svg"));
}
/*!
@@ -160,9 +160,9 @@ void MessageDock::slotCppChanged()
// Change compiler tab icon
if (error)
- builderTabs->setTabIcon(1,QPixmap(":/bitmaps/error.png"));
+ builderTabs->setTabIcon(1,QPixmap(":/bitmaps/svg/error.svg"));
else
- builderTabs->setTabIcon(1,QPixmap(":/bitmaps/tick.png"));
+ builderTabs->setTabIcon(1,QPixmap(":/bitmaps/svg/ok_apply.svg"));
}
/*!
diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp
index 02ef24ab2..1466c9e24 100644
--- a/qucs/qucs.cpp
+++ b/qucs/qucs.cpp
@@ -86,47 +86,6 @@
//#include "extsimkernels/codemodelgen.h"
#include "symbolwidget.h"
-// icon for unsaved files (diskette)
-const char *smallsave_xpm[] = {
-"16 17 66 1", " c None",
-". c #595963","+ c #E6E6F1","@ c #465460","# c #FEFEFF",
-"$ c #DEDEEE","% c #43535F","& c #D1D1E6","* c #5E5E66",
-"= c #FFFFFF","- c #C5C5DF","; c #FCF8F9","> c #BDBDDA",
-", c #BFBFDC","' c #C4C4DF",") c #FBF7F7","! c #D6D6E9",
-"~ c #CBCBE3","{ c #B5B5D6","] c #BCBCDA","^ c #C6C6E0",
-"/ c #CFCFE5","( c #CEC9DC","_ c #D8D8EA",": c #DADAEB",
-"< c #313134","[ c #807FB3","} c #AEAED1","| c #B7B7D7",
-"1 c #E2E2EF","2 c #9393C0","3 c #E3E3F0","4 c #DDD5E1",
-"5 c #E8E8F3","6 c #2F2F31","7 c #7B7BAF","8 c #8383B5",
-"9 c #151518","0 c #000000","a c #C0C0DC","b c #8E8FBD",
-"c c #8989BA","d c #E7EEF6","e c #282829","f c #6867A1",
-"g c #7373A9","h c #A7A7CD","i c #8080B3","j c #7B7CB0",
-"k c #7070A8","l c #6D6DA5","m c #6E6EA6","n c #6969A2",
-"o c #7A79AF","p c #DCDCEC","q c #60609A","r c #7777AC",
-"s c #5D5D98","t c #7676AB","u c #484785","v c #575793",
-"w c #50506A","x c #8787B8","y c #53536E","z c #07070E",
-"A c #666688",
-" . ",
-" .+. ",
-" .+@#. ",
-" .$%###. ",
-" .&*####=. ",
-" .-.#;#####. ",
-" .>,'.#)!!!!~. ",
-" .{].'^./(!_:<[.",
-".}|.1./2.3456789",
-"0a.$11.bc.defg9 ",
-" 011h11.ij9kl9 ",
-" 0_1h1h.mno9 ",
-" 0p12h9qr9 ",
-" 0hh9st9 ",
-" 09uv9w ",
-" 0x9y ",
-" zA "};
-
-const char *empty_xpm[] = { // provides same height than "smallsave_xpm"
-"1 17 1 1", " c None", " ", " ", " ", " ", " ",
-" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "};
struct iconCompInfoStruct
{
@@ -2153,7 +2112,11 @@ void QucsApp::setDocumentTabChanged(int index, bool changed)
#ifdef __APPLE__
((QLabel *)DocumentTab->tabBar()->tabButton(index, QTabBar::RightSide))->setText(changed ? "\u26AB" : " ");
#else
- DocumentTab->setTabIcon(index,QPixmap((changed)? smallsave_xpm : empty_xpm));
+ if (changed) {
+ DocumentTab->setTabIcon(index,QIcon(":bitmaps/svg/filesave.svg"));
+ } else {
+ DocumentTab->setTabIcon(index,QIcon());
+ }
#endif
}
diff --git a/qucs/qucs.qrc b/qucs/qucs.qrc
index 13ee701ce..0555244e8 100644
--- a/qucs/qucs.qrc
+++ b/qucs/qucs.qrc
@@ -17,7 +17,6 @@
bitmaps/big.qucs.xpm
bitmaps/binarytogrey4bit.png
bitmaps/bondwire.png
- bitmaps/bottom.png
bitmaps/buffer.png
bitmaps/capacitor.png
bitmaps/capq.png
@@ -42,7 +41,6 @@
bitmaps/dc.png
bitmaps/dcblock.png
bitmaps/dcfeed.png
- bitmaps/deactiv.png
bitmaps/dff_SR.png
bitmaps/dflipflop.png
bitmaps/diac.png
@@ -57,10 +55,6 @@
bitmaps/dmux3to8.png
bitmaps/dmux4to16.png
bitmaps/edd.png
- bitmaps/editcopy.png
- bitmaps/editcut.png
- bitmaps/editdelete.png
- bitmaps/editpaste.png
bitmaps/EKV26nMOS.png
bitmaps/EKV26pMOS.png
bitmaps/ellipse.png
@@ -68,17 +62,11 @@
bitmaps/equation.png
bitmaps/fa1b.png
bitmaps/fa2b.png
- bitmaps/fileclose.png
- bitmaps/filenew.png
bitmaps/fileopen.png
- bitmaps/fileprint.png
- bitmaps/filesave.png
- bitmaps/filesaveall.png
bitmaps/filledellipse.png
bitmaps/filledrect.png
bitmaps/forward.png
bitmaps/gatedDlatch.png
- bitmaps/gear.png
bitmaps/gnd.png
bitmaps/greytobinary4bit.png
bitmaps/ground.png
@@ -103,10 +91,7 @@
bitmaps/log_amp.png
bitmaps/logic_0.png
bitmaps/logic_1.png
- bitmaps/marker.png
bitmaps/MESFET.png
- bitmaps/mirror.png
- bitmaps/mirrory.png
bitmaps/mod_amp.png
bitmaps/mscorner.png
bitmaps/mscoupled.png
@@ -132,7 +117,6 @@
bitmaps/nigbt.png
bitmaps/nmosfet_sub.png
bitmaps/nmosfet.png
- bitmaps/nodename.png
bitmaps/noise_current.png
bitmaps/noise_ii.png
bitmaps/noise_iv.png
@@ -159,7 +143,6 @@
bitmaps/pnp.png
bitmaps/pnpsub_therm.png
bitmaps/pnpsub.png
- bitmaps/pointer.png
bitmaps/polar.png
bitmaps/polarsmith.png
bitmaps/port.png
@@ -167,7 +150,6 @@
bitmaps/previous.png
bitmaps/pshifter.png
bitmaps/quit.png
- bitmaps/rebuild.png
bitmaps/rect.png
bitmaps/rect3d.png
bitmaps/rectangle.png
@@ -178,7 +160,6 @@
bitmaps/resistor.png
bitmaps/rfedd.png
bitmaps/rlcg.png
- bitmaps/rotate_ccw.png
bitmaps/rsflipflop.png
bitmaps/smith.png
bitmaps/smithpolar.png
@@ -197,7 +178,6 @@
bitmaps/tabular.png
bitmaps/taperedline.png
bitmaps/text.png
- bitmaps/textnew.png
bitmaps/tff_SR.png
bitmaps/thyristor.png
bitmaps/timing.png
@@ -205,7 +185,6 @@
bitmaps/tiny.qucs.xpm
bitmaps/tline_4port.png
bitmaps/tline.png
- bitmaps/top.png
bitmaps/tran.png
bitmaps/transformer.png
bitmaps/triac.png
@@ -225,15 +204,12 @@
bitmaps/vprobe.png
bitmaps/vpulse.png
bitmaps/vrect.png
- bitmaps/wire.png
bitmaps/xnor.png
bitmaps/xor.png
bitmaps/ysmith.png
bitmaps/etran.png
bitmaps/ecvs.png
bitmaps/vcresistor.png
- bitmaps/tick.png
- bitmaps/error.png
bitmaps/hicolor/128x128/apps/qucs.png
bitmaps/S4Q_V.png
bitmaps/S4Q_I.png
@@ -321,8 +297,6 @@
bitmaps/spicegeneric.png
bitmaps/spicelibcomp.png
bitmaps/xyce_script.png
- bitmaps/RemoveElementTuning.png
- bitmaps/tune.png
bitmaps/dark/ac_current.png
bitmaps/dark/ac_voltage.png
bitmaps/dark/am_mod.png
@@ -494,5 +468,35 @@
bitmaps/dark/vpulse.png
bitmaps/dark/vrect.png
bitmaps/dark/irect.png
+ bitmaps/svg/filenew.svg
+ bitmaps/svg/textnew.svg
+ bitmaps/svg/filesave.svg
+ bitmaps/svg/filesaveall.svg
+ bitmaps/svg/fileclose.svg
+ bitmaps/svg/fileprint.svg
+ bitmaps/svg/editcopy.svg
+ bitmaps/svg/editcut.svg
+ bitmaps/svg/editpaste.svg
+ bitmaps/svg/editdelete.svg
+ bitmaps/svg/editredo.svg
+ bitmaps/svg/editundo.svg
+ bitmaps/svg/mirror.svg
+ bitmaps/svg/mirrory.svg
+ bitmaps/svg/rotate_ccw.svg
+ bitmaps/svg/pointer.svg
+ bitmaps/svg/top.svg
+ bitmaps/svg/bottom.svg
+ bitmaps/svg/deactiv.svg
+ bitmaps/svg/wire.svg
+ bitmaps/svg/nodename.svg
+ bitmaps/svg/equation.svg
+ bitmaps/svg/ground.svg
+ bitmaps/svg/port.svg
+ bitmaps/svg/gear.svg
+ bitmaps/svg/tune.svg
+ bitmaps/svg/rebuild.svg
+ bitmaps/svg/marker.svg
+ bitmaps/svg/ok_apply.svg
+ bitmaps/svg/error.svg
diff --git a/qucs/qucs_init.cpp b/qucs/qucs_init.cpp
index 4a97eec3f..9d85b619f 100644
--- a/qucs/qucs_init.cpp
+++ b/qucs/qucs_init.cpp
@@ -45,14 +45,14 @@ void QucsApp::initActions()
// note: first argument of QAction() for backward compatibility Qt < 3.2
- fileNew = new QAction(QIcon((":/bitmaps/filenew.png")), tr("&New"), this);
+ fileNew = new QAction(QIcon((":/bitmaps/svg/filenew.svg")), tr("&New"), this);
fileNew->setShortcut(QKeySequence::New);
fileNew->setStatusTip(tr("Creates a new document"));
fileNew->setWhatsThis(
tr("New\n\nCreates a new schematic or data display document"));
connect(fileNew, SIGNAL(triggered()), SLOT(slotFileNew()));
- textNew = new QAction(QIcon((":/bitmaps/textnew.png")), tr("New &Text"), this);
+ textNew = new QAction(QIcon((":/bitmaps/svg/textnew.svg")), tr("New &Text"), this);
textNew->setShortcut(tr("Ctrl+Shift+V"));
textNew->setStatusTip(tr("Creates a new text document"));
textNew->setWhatsThis(tr("New Text\n\nCreates a new text document"));
@@ -64,7 +64,7 @@ void QucsApp::initActions()
fileOpen->setWhatsThis(tr("Open File\n\nOpens an existing document"));
connect(fileOpen, SIGNAL(triggered()), SLOT(slotFileOpen()));
- fileSave = new QAction(QIcon((":/bitmaps/filesave.png")), tr("&Save"), this);
+ fileSave = new QAction(QIcon((":/bitmaps/svg/filesave.svg")), tr("&Save"), this);
fileSave->setShortcut(QKeySequence::Save);
fileSave->setStatusTip(tr("Saves the current document"));
fileSave->setWhatsThis(tr("Save File\n\nSaves the current document"));
@@ -76,13 +76,13 @@ void QucsApp::initActions()
fileSaveAs->setWhatsThis( tr("Save As\n\nSaves the current document under a new filename"));
connect(fileSaveAs, SIGNAL(triggered()), SLOT(slotFileSaveAs()));
- fileSaveAll = new QAction(QIcon((":/bitmaps/filesaveall.png")), tr("Save &All"), this);
+ fileSaveAll = new QAction(QIcon((":/bitmaps/svg/filesaveall.svg")), tr("Save &All"), this);
fileSaveAll->setShortcut(tr("Ctrl+Shift+S"));
fileSaveAll->setStatusTip(tr("Saves all open documents"));
fileSaveAll->setWhatsThis(tr("Save All Files\n\nSaves all open documents"));
connect(fileSaveAll, SIGNAL(triggered()), SLOT(slotFileSaveAll()));
- fileClose = new QAction(QIcon((":/bitmaps/fileclose.png")), tr("&Close"), this);
+ fileClose = new QAction(QIcon((":/bitmaps/svg/fileclose.svg")), tr("&Close"), this);
fileClose->setShortcut(QKeySequence::Close);
fileClose->setStatusTip(tr("Closes the current document"));
fileClose->setWhatsThis(tr("Close File\n\nCloses the current document"));
@@ -117,7 +117,7 @@ void QucsApp::initActions()
fileSettings->setWhatsThis(tr("Settings\n\nSets properties of the file"));
connect(fileSettings, SIGNAL(triggered()), SLOT(slotFileSettings()));
- filePrint = new QAction(QIcon((":/bitmaps/fileprint.png")), tr("&Print..."), this);
+ filePrint = new QAction(QIcon((":/bitmaps/svg/fileprint.svg")), tr("&Print..."), this);
filePrint->setShortcut(QKeySequence::Print);
filePrint->setStatusTip(tr("Prints the current document"));
filePrint->setWhatsThis(tr("Print File\n\nPrints the current document"));
@@ -220,26 +220,26 @@ void QucsApp::initActions()
tr("Replace\n\nChange component properties\nor\ntext in VHDL code"));
connect(changeProps, SIGNAL(triggered()), SLOT(slotChangeProps()));
- editCut = new QAction(QIcon((":/bitmaps/editcut.png")), tr("Cu&t"), this);
+ editCut = new QAction(QIcon((":/bitmaps/svg/editcut.svg")), tr("Cu&t"), this);
editCut->setShortcut(tr("Ctrl+X"));
editCut->setStatusTip(tr("Cuts out the selection and puts it into the clipboard"));
editCut->setWhatsThis(tr("Cut\n\nCuts out the selection and puts it into the clipboard"));
connect(editCut, SIGNAL(triggered()), SLOT(slotEditCut()));
- editCopy = new QAction(QIcon((":/bitmaps/editcopy.png")), tr("&Copy"), this);
+ editCopy = new QAction(QIcon((":/bitmaps/svg/editcopy.svg")), tr("&Copy"), this);
editCopy->setShortcut(QKeySequence::Copy);
editCopy->setStatusTip(tr("Copies the selection into the clipboard"));
editCopy->setWhatsThis(tr("Copy\n\nCopies the selection into the clipboard"));
connect(editCopy, SIGNAL(triggered()), SLOT(slotEditCopy()));
- editPaste = new QAction(QIcon((":/bitmaps/editpaste.png")), tr("&Paste"), this);
+ editPaste = new QAction(QIcon((":/bitmaps/svg/editpaste.svg")), tr("&Paste"), this);
editPaste->setShortcut(QKeySequence::Paste);
editPaste->setStatusTip(tr("Pastes the clipboard contents to the cursor position"));
editPaste->setWhatsThis(tr("Paste\n\nPastes the clipboard contents to the cursor position"));
editPaste->setCheckable(true);
connect(editPaste, SIGNAL(toggled(bool)), SLOT(slotEditPaste(bool)));
- editDelete = new QAction(QIcon((":/bitmaps/editdelete.png")), tr("&Delete"), this);
+ editDelete = new QAction(QIcon((":/bitmaps/svg/editdelete.svg")), tr("&Delete"), this);
editDelete->setShortcut(QKeySequence::Delete);
editDelete->setStatusTip(tr("Deletes the selected components"));
editDelete->setWhatsThis(tr("Delete\n\nDeletes the selected components"));
@@ -275,13 +275,13 @@ void QucsApp::initActions()
cursorDown = new QShortcut(QKeySequence(Qt::Key_Down), this);
connect(cursorDown, SIGNAL(activated()), SLOT(slotCursorDown()));
- undo = new QAction(QIcon((":/bitmaps/undo.png")), tr("&Undo"), this);
+ undo = new QAction(QIcon((":/bitmaps/svg/editundo.svg")), tr("&Undo"), this);
undo->setShortcut(QKeySequence::Undo);
undo->setStatusTip(tr("Undoes the last command"));
undo->setWhatsThis(tr("Undo\n\nMakes the last action undone"));
connect(undo, SIGNAL(triggered()), SLOT(slotEditUndo()));
- redo = new QAction(QIcon((":/bitmaps/redo.png")), tr("&Redo"), this);
+ redo = new QAction(QIcon((":/bitmaps/svg/editredo.svg")), tr("&Redo"), this);
redo->setShortcut(QKeySequence::Redo);
redo->setStatusTip(tr("Redoes the last command"));
redo->setWhatsThis(tr("Redo\n\nRepeats the last action once more"));
@@ -388,7 +388,7 @@ void QucsApp::initActions()
connect(escape, SIGNAL(triggered()), SLOT(slotEscape()));
this->addAction(escape);
- select = new QAction(QIcon((":/bitmaps/pointer.png")), tr("Select"), this);
+ select = new QAction(QIcon((":/bitmaps/svg/pointer.svg")), tr("Select"), this);
select->setStatusTip(tr("Activate select mode"));
select->setWhatsThis(tr("Select\n\nActivates select mode"));
select->setCheckable(true);
@@ -406,76 +406,76 @@ void QucsApp::initActions()
selectMarker->setWhatsThis(tr("Select Markers\n\nSelects all diagram markers of the document"));
connect(selectMarker, SIGNAL(triggered()), SLOT(slotSelectMarker()));
- editRotate = new QAction(QIcon(misc::getIconPath("rotate_ccw.png", qucs::panelIcons)), tr("Rotate"), this);
+ editRotate = new QAction(QIcon(":/bitmaps/svg/rotate_ccw.svg"), tr("Rotate"), this);
editRotate->setShortcut(tr("Ctrl+R"));
editRotate->setStatusTip(tr("Rotates the selected component by 90\x00B0"));
editRotate->setWhatsThis(tr("Rotate\n\nRotates the selected component by 90\x00B0 counter-clockwise"));
editRotate->setCheckable(true);
connect(editRotate, SIGNAL(toggled(bool)), SLOT(slotEditRotate(bool)));
- editMirror = new QAction(QIcon(misc::getIconPath("mirror.png", qucs::panelIcons)), tr("Mirror about X Axis"), this);
+ editMirror = new QAction(QIcon(":/bitmaps/svg/mirror.svg"), tr("Mirror about X Axis"), this);
editMirror->setShortcut(tr("Ctrl+J"));
editMirror->setStatusTip(tr("Mirrors the selected item about X Axis"));
editMirror->setWhatsThis(tr("Mirror about X Axis\n\nMirrors the selected item about X Axis"));
editMirror->setCheckable(true);
connect(editMirror, SIGNAL(toggled(bool)), SLOT(slotEditMirrorX(bool)));
- editMirrorY = new QAction(QIcon(misc::getIconPath("mirrory.png", qucs::panelIcons)), tr("Mirror about Y Axis"), this);
+ editMirrorY = new QAction(QIcon(":/bitmaps/svg/mirrory.svg"), tr("Mirror about Y Axis"), this);
editMirrorY->setShortcut(tr("Ctrl+M"));
editMirrorY->setStatusTip(tr("Mirrors the selected item about Y Axis"));
editMirrorY->setWhatsThis(tr("Mirror about Y Axis\n\nMirrors the selected item about Y Axis"));
editMirrorY->setCheckable(true);
connect(editMirrorY, SIGNAL(toggled(bool)), SLOT(slotEditMirrorY(bool)));
- intoH = new QAction(QIcon((":/bitmaps/bottom.png")), tr("Go into Subcircuit"), this);
+ intoH = new QAction(QIcon((":/bitmaps/svg/bottom.svg")), tr("Go into Subcircuit"), this);
intoH->setShortcut(tr("Ctrl+I"));
intoH->setStatusTip(tr("Goes inside the selected subcircuit"));
intoH->setWhatsThis(
tr("Go into Subcircuit\n\nGoes inside the selected subcircuit"));
connect(intoH, SIGNAL(triggered()), SLOT(slotIntoHierarchy()));
- popH = new QAction(QIcon((":/bitmaps/top.png")), tr("Pop out"), this);
+ popH = new QAction(QIcon((":/bitmaps/svg/top.svg")), tr("Pop out"), this);
popH->setShortcut(tr("Ctrl+H"));
popH->setStatusTip(tr("Pop outside subcircuit"));
popH->setWhatsThis(tr("Pop out\n\nGoes up one hierarchy level, i.e. leaves subcircuit"));
connect(popH, SIGNAL(triggered()), SLOT(slotPopHierarchy()));
popH->setEnabled(false); // only enabled if useful !!!!
- editActivate = new QAction(QIcon(misc::getIconPath("deactiv.png", qucs::panelIcons)), tr("Deactivate/Activate"), this);
+ editActivate = new QAction(QIcon(":bitmaps/svg/deactiv.svg"), tr("Deactivate/Activate"), this);
editActivate->setShortcut(tr("Ctrl+D"));
editActivate->setStatusTip(tr("Deactivate/Activate selected components"));
editActivate->setWhatsThis(tr("Deactivate/Activate\n\nDeactivate/Activate the selected components"));
editActivate->setCheckable(true);
connect(editActivate, SIGNAL(toggled(bool)), SLOT(slotEditActivate(bool)));
- insEquation = new QAction(QIcon(misc::getIconPath("equation.png", qucs::panelIcons)), tr("Insert Equation"), this);
+ insEquation = new QAction(QIcon(":bitmaps/svg/equation.svg"), tr("Insert Equation"), this);
insEquation->setShortcut(tr("Ctrl+<"));
insEquation->setStatusTip(tr("Inserts an equation"));
insEquation->setWhatsThis(tr("Insert Equation\n\nInserts a user defined equation"));
insEquation->setCheckable(true);
connect(insEquation, SIGNAL(toggled(bool)), SLOT(slotInsertEquation(bool)));
- insGround = new QAction(QIcon(misc::getIconPath("ground.png", qucs::panelIcons)), tr("Insert Ground"), this);
+ insGround = new QAction(QIcon(":/bitmaps/svg/ground.svg"), tr("Insert Ground"), this);
insGround->setShortcut(tr("Ctrl+G"));
insGround->setStatusTip(tr("Inserts a ground symbol"));
insGround->setWhatsThis(tr("Insert Ground\n\nInserts a ground symbol"));
insGround->setCheckable(true);
connect(insGround, SIGNAL(toggled(bool)), SLOT(slotInsertGround(bool)));
- insPort = new QAction(QIcon(misc::getIconPath("port.png", qucs::panelIcons)), tr("Insert Port"), this);
+ insPort = new QAction(QIcon(":/bitmaps/svg/port.svg"), tr("Insert Port"), this);
insPort->setStatusTip(tr("Inserts a port symbol"));
insPort->setWhatsThis(tr("Insert Port\n\nInserts a port symbol"));
insPort->setCheckable(true);
connect(insPort, SIGNAL(toggled(bool)), SLOT(slotInsertPort(bool)));
- insWire = new QAction(QIcon(misc::getIconPath("wire.png", qucs::panelIcons)), tr("Wire"), this);
+ insWire = new QAction(QIcon(":bitmaps/svg/wire.svg"), tr("Wire"), this);
insWire->setShortcut(tr("Ctrl+E"));
insWire->setStatusTip(tr("Inserts a wire"));
insWire->setWhatsThis(tr("Wire\n\nInserts a wire"));
insWire->setCheckable(true);
connect(insWire, SIGNAL(toggled(bool)), SLOT(slotSetWire(bool)));
- insLabel = new QAction(QIcon(misc::getIconPath("nodename.png", qucs::panelIcons)), tr("Wire Label"), this);
+ insLabel = new QAction(QIcon(":/bitmaps/svg/nodename.svg"), tr("Wire Label"), this);
insLabel->setShortcut(tr("Ctrl+L"));
insLabel->setStatusTip(tr("Inserts a wire or pin label"));
insLabel->setWhatsThis(tr("Wire Label\n\nInserts a wire or pin label"));
@@ -531,20 +531,20 @@ void QucsApp::initActions()
callPwrComb->setWhatsThis(tr("Power combining\n\nStarts power combining calculation program"));
connect(callPwrComb, SIGNAL(triggered()), SLOT(slotCallPwrComb()));
- simulate = new QAction(QIcon((":/bitmaps/gear.png")), tr("Simulate"), this);
+ simulate = new QAction(QIcon((":/bitmaps/svg/gear.svg")), tr("Simulate"), this);
simulate->setShortcut(Qt::Key_F2);
simulate->setStatusTip(tr("Simulates the current schematic"));
simulate->setWhatsThis(tr("Simulate\n\nSimulates the current schematic"));
connect(simulate, SIGNAL(triggered()), SLOT(slotSimulate()));
- tune = new QAction(QIcon((":/bitmaps/tune.png")),"Tune", this);
+ tune = new QAction(QIcon((":/bitmaps/svg/tune.svg")),"Tune", this);
tune->setShortcut(Qt::Key_F3);
tune->setStatusTip("Tuner");
tune->setWhatsThis("Allows to live tune variables and show the result in the dataview");
tune->setCheckable(true);
connect(tune, SIGNAL(toggled(bool)), SLOT(slotTune(bool)));
- dpl_sch = new QAction(QIcon((":/bitmaps/rebuild.png")), tr("View Data Display/Schematic"), this);
+ dpl_sch = new QAction(QIcon((":/bitmaps/svg/rebuild.svg")), tr("View Data Display/Schematic"), this);
dpl_sch->setShortcut(Qt::Key_F4);
dpl_sch->setStatusTip(tr("Changes to data display or schematic page"));
dpl_sch->setWhatsThis(tr("View Data Display/Schematic\n\nChanges to data display or schematic page"));
@@ -561,7 +561,7 @@ void QucsApp::initActions()
save_netlist->setWhatsThis(tr("Save netlist to file"));
connect(save_netlist, SIGNAL(triggered()), SLOT(slotSaveNetlist()));
- setMarker = new QAction(QIcon((":/bitmaps/marker.png")), tr("Set Marker on Graph"), this);
+ setMarker = new QAction(QIcon((":/bitmaps/svg/marker.svg")), tr("Set Marker on Graph"), this);
setMarker->setShortcut(Qt::CTRL|Qt::Key_B);
setMarker->setStatusTip(tr("Sets a marker on a diagram's graph"));
setMarker->setWhatsThis(tr("Set Marker\n\nSets a marker on a diagram's graph"));