diff --git a/src/musredit_qt5/PTextEdit.cpp b/src/musredit_qt5/PTextEdit.cpp index 0068cab3..716a716e 100644 --- a/src/musredit_qt5/PTextEdit.cpp +++ b/src/musredit_qt5/PTextEdit.cpp @@ -489,14 +489,14 @@ void PTextEdit::setupMusrActions() menuBar()->addMenu( menu ); QAction *a; - a = new QAction( QIcon( QPixmap( ":/icons/musrasym.xpm" ) ), tr( "&Asymmetry Default" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrAsym-plain.svg" ) ), tr( "&Asymmetry Default" ), this ); a->setShortcut( tr("Alt+A") ); a->setStatusTip( tr("Get Default Asymmetry msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrGetAsymmetryDefault() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/icons/musrsinglehisto.xpm" ) ), tr( "Single &Histogram Default" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrSingleHisto-plain.svg" ) ), tr( "Single &Histogram Default" ), this ); a->setShortcut( tr("Alt+H") ); a->setStatusTip( tr("Get Default Single Histogram msr-file") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrGetSingleHistoDefault() ) ); @@ -544,20 +544,20 @@ void PTextEdit::setupMusrActions() tb->addAction(a); menu->addAction(a); - fMusrT0Action = new QAction( QIcon( QPixmap( ":/icons/musrt0.xpm" ) ), tr( "&T0" ), this ); + fMusrT0Action = new QAction( QIcon( QPixmap( ":/icons/musrt0-plain.svg" ) ), tr( "&T0" ), this ); fMusrT0Action->setStatusTip( tr("Start musrt0") ); connect( fMusrT0Action, SIGNAL( triggered() ), this, SLOT( musrT0() ) ); tb->addAction(fMusrT0Action); menu->addAction(fMusrT0Action); fMusrT0Action->setEnabled(fAdmin->getEnableMusrT0Flag()); - a = new QAction( QIcon( QPixmap (":/icons/musrFT.xpm") ), tr( "Raw Fourier" ), this ); + a = new QAction( QIcon( QPixmap (":/icons/musrFT-plain.svg") ), tr( "Raw Fourier" ), this ); a->setStatusTip( tr("Start musrFT") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrFT() ) ); tb->addAction(a); menu->addAction(a); - a = new QAction( QIcon( QPixmap( ":/icons/musrprefs.xpm" ) ), tr( "&Preferences" ), this ); + a = new QAction( QIcon( QPixmap( ":/icons/musrprefs-plain.svg" ) ), tr( "&Preferences" ), this ); a->setStatusTip( tr("Show Preferences") ); connect( a, SIGNAL( triggered() ), this, SLOT( musrPrefs() ) ); tb->addAction(a); @@ -566,7 +566,7 @@ void PTextEdit::setupMusrActions() menu->addSeparator(); tb->addSeparator(); - a = new QAction( QIcon( QPixmap(":/icons/musrdump.xpm")), tr( "&Dump Header"), this); + a = new QAction( QIcon( QPixmap(":/icons/musrdump-plain.svg")), tr( "&Dump Header"), this); a->setStatusTip( tr("Dumps muSR File Header Information") ); connect( a, SIGNAL(triggered()), this, SLOT(musrDump())); tb->addAction(a); diff --git a/src/musredit_qt5/icons/inkscape/musrAsym.svg b/src/musredit_qt5/icons/inkscape/musrAsym.svg new file mode 100644 index 00000000..dedda475 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrAsym.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + ASYM + + + diff --git a/src/musredit_qt5/icons/inkscape/musrFT.svg b/src/musredit_qt5/icons/inkscape/musrFT.svg new file mode 100644 index 00000000..98515d4d --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrFT.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrSingleHisto.svg b/src/musredit_qt5/icons/inkscape/musrSingleHisto.svg new file mode 100644 index 00000000..9ea2dd3a --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrSingleHisto.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + HISTO + + + diff --git a/src/musredit_qt5/icons/inkscape/musrdump.svg b/src/musredit_qt5/icons/inkscape/musrdump.svg new file mode 100644 index 00000000..c13a8e1f --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrdump.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + DUMP + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrprefs.svg b/src/musredit_qt5/icons/inkscape/musrprefs.svg new file mode 100644 index 00000000..e4d7b3b2 --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrprefs.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + PREFS + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/inkscape/musrt0.svg b/src/musredit_qt5/icons/inkscape/musrt0.svg new file mode 100644 index 00000000..83a2d02f --- /dev/null +++ b/src/musredit_qt5/icons/inkscape/musrt0.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + T0 + + diff --git a/src/musredit_qt5/icons/musrAsym-plain.svg b/src/musredit_qt5/icons/musrAsym-plain.svg new file mode 100644 index 00000000..b723be47 --- /dev/null +++ b/src/musredit_qt5/icons/musrAsym-plain.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + ASYM + + + diff --git a/src/musredit_qt5/icons/musrFT-plain.svg b/src/musredit_qt5/icons/musrFT-plain.svg new file mode 100644 index 00000000..e9289a3a --- /dev/null +++ b/src/musredit_qt5/icons/musrFT-plain.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrFT.xpm b/src/musredit_qt5/icons/musrFT.xpm deleted file mode 100644 index 406c21dc..00000000 --- a/src/musredit_qt5/icons/musrFT.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"22 22 3 1", -". c None", -"# c #000000", -"a c #ff0000", -"..##....###...##......", -"......................", -"######################", -"......................", -".........a............", -".........a............", -".........a............", -".........a............", -".........aa...........", -"........aaa...........", -"........aaa...........", -"........a.a...........", -"........a.a...........", -".......aa.aa..........", -".......aa..aa.........", -"a.aaa..a....aaa...aa..", -"aa.aaa.a......aaa.aaaa", -"......a..........aa...", -"######################", -"......................", -".#######.####..####...", -"......................"}; diff --git a/src/musredit_qt5/icons/musrSingleHisto-plain.svg b/src/musredit_qt5/icons/musrSingleHisto-plain.svg new file mode 100644 index 00000000..86c2b153 --- /dev/null +++ b/src/musredit_qt5/icons/musrSingleHisto-plain.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + HISTO + + + diff --git a/src/musredit_qt5/icons/musrasym.xpm b/src/musredit_qt5/icons/musrasym.xpm deleted file mode 100644 index 64bfb2f4..00000000 --- a/src/musredit_qt5/icons/musrasym.xpm +++ /dev/null @@ -1,29 +0,0 @@ -/* XPM */ -static char * musrasym_xpm[] = { -"22 22 4 1", -" c None", -". c #3D20CF", -"+ c #FF0000", -"@ c #000000", -" ", -" . .. . . . .", -" . . . . . . .. ..", -". . . . . . . .", -". . .. . . . .", -"..... . . . .", -". . . . . . .", -". . .. . . .", -" ", -" ++ ", -"+ + ", -" + ", -" + ", -" + ", -" + ++ ", -" + + + +", -"@@@@@@@+@@@@+@@@@+@@+ ", -" + + ++ ", -" ++ ", -" ", -" ", -" "}; diff --git a/src/musredit_qt5/icons/musrdump-plain.svg b/src/musredit_qt5/icons/musrdump-plain.svg new file mode 100644 index 00000000..f81adb2f --- /dev/null +++ b/src/musredit_qt5/icons/musrdump-plain.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + DUMP + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrdump.xpm b/src/musredit_qt5/icons/musrdump.xpm deleted file mode 100644 index f6d401f0..00000000 --- a/src/musredit_qt5/icons/musrdump.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrdump_xpm[] = { -"22 22 3 1", -" c None", -". c #0000FF", -"+ c #000000", -"... . . . . ... ", -". . . . .. .. . .", -". . . . . . . . .", -". . . . . . . . .", -". . . . . . ... ", -". . . . . . . ", -"... ... . . . ", -" ", -" ", -"+++ ", -" ++++ ", -" + ", -" ++++ ", -" + ", -" ++++ ", -" + + ", -" + +++++ ", -" + +++ ", -" ++++ + ", -" +++ +++ ", -" + ++++ ", -" +++ + "}; diff --git a/src/musredit_qt5/icons/musrmsr2data.xpm b/src/musredit_qt5/icons/musrmsr2data.xpm deleted file mode 100644 index 4aa1bd07..00000000 --- a/src/musredit_qt5/icons/musrmsr2data.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrmlog2db_xpm[] = { -"22 22 3 1", -" c None", -". c #000000", -"+ c #FF0000", -" .... . ..... ", -".... . . . ", -" . . . ", -".... ... . . ", -" . . . ", -"....... . . . ", -" . . . ", -".... ", -" + ", -"... + ", -" + ", -"...... + + + ", -" +++ ", -".... + ", -" ", -".... +++ +++ ", -" + + + + ", -"..... + + + + ", -" + + +++ ", -"...... + + + + ", -" + + + + ", -".... +++ +++ "}; diff --git a/src/musredit_qt5/icons/musrprefs-plain.svg b/src/musredit_qt5/icons/musrprefs-plain.svg new file mode 100644 index 00000000..7230817b --- /dev/null +++ b/src/musredit_qt5/icons/musrprefs-plain.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + PREFS + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrprefs.xpm b/src/musredit_qt5/icons/musrprefs.xpm deleted file mode 100644 index f52e3e32..00000000 --- a/src/musredit_qt5/icons/musrprefs.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrprefs_xpm[] = { -"22 22 3 1", -" c None", -". c #3D20CF", -"+ c #000000", -"... ... ... ... ... ", -". . . . . . . ", -"... ... ... ... ... ", -". . . . . . ", -". . . ... . ... ", -" ", -" + + ", -" + + + ", -"+ ++++ ++ + ", -" + + + + ", -" + + ", -" ", -" + + ", -" + + + ++ ++ + ", -"+ + +++ + + + + + ", -" + + + + ", -" + + ", -" ", -" + + + ", -" + + + + + ", -"+ + +++++++++ + ++ +", -" + ++ ++ + + "}; diff --git a/src/musredit_qt5/icons/musrsinglehisto.xpm b/src/musredit_qt5/icons/musrsinglehisto.xpm deleted file mode 100644 index bc1e3ec2..00000000 --- a/src/musredit_qt5/icons/musrsinglehisto.xpm +++ /dev/null @@ -1,29 +0,0 @@ -/* XPM */ -static char * musrsinglehisto_xpm[] = { -"22 22 4 1", -" c None", -". c #3D20CF", -"+ c #FF0000", -"@ c #000000", -" ", -". . . .. ..... ... ", -".++ . . . . . . .", -". + . . . . . .", -"..... . .. . . .", -". +. . . . . .", -". . . . . . . .", -". .+. .. . ... ", -"@ + ", -"@ + ", -"@ + ", -"@ ++ ", -"@ + ", -"@ + ", -"@ + ", -"@ + ", -"@ ++ ", -"@ + ", -"@ ++ ", -"@ ++ ", -"@ ++ ", -"@@@@@@@@@@@@@@@@@@@+++"}; diff --git a/src/musredit_qt5/icons/musrt0-plain.svg b/src/musredit_qt5/icons/musrt0-plain.svg new file mode 100644 index 00000000..28da0830 --- /dev/null +++ b/src/musredit_qt5/icons/musrt0-plain.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + T0 + + diff --git a/src/musredit_qt5/icons/musrt0.xpm b/src/musredit_qt5/icons/musrt0.xpm deleted file mode 100644 index 6a14ac0e..00000000 --- a/src/musredit_qt5/icons/musrt0.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * musrt0_xpm[] = { -"22 22 3 1", -" c None", -". c #3D20CF", -"+ c #000000", -"..... .. ", -" . . . ", -" . . . ", -" . . . ", -" . + . . ++ ", -" . + . .+ ++ ", -" . + .. + + ", -" + + +++ ", -" + + + ", -" + + ++ ", -" + + + ", -" + + + ", -" + + ++ ", -" + + ++++ ", -" + + + ", -" + + ++", -" + + ", -" + + ", -" + + ", -" + ++ + ", -"++ + + ", -" "}; diff --git a/src/musredit_qt5/musredit.qrc b/src/musredit_qt5/musredit.qrc index 37915851..68883051 100644 --- a/src/musredit_qt5/musredit.qrc +++ b/src/musredit_qt5/musredit.qrc @@ -13,17 +13,17 @@ icons/document-print-plain.svg icons/view-refresh-plain.svg icons/document-save-plain.svg - icons/musrasym.xpm + icons/musrAsym-plain.svg icons/musrchisq-plain.svg icons/musrfit-plain.svg icons/msr2data-plain.svg - icons/musrprefs.xpm - icons/musrsinglehisto.xpm + icons/musrprefs-plain.svg + icons/musrSingleHisto-plain.svg icons/musrswap-plain.svg - icons/musrt0.xpm + icons/musrt0-plain.svg icons/musrview-plain.svg - icons/musrFT.xpm - icons/musrdump.xpm + icons/musrFT-plain.svg + icons/musrdump-plain.svg latex_images/abragam.png latex_images/asymmetry.png latex_images/bessel.png