diff --git a/Jamulus.pro b/Jamulus.pro index 180d02ebf3..28c3978b72 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -747,10 +747,8 @@ DISTFILES += ChangeLog \ src/res/CLEDBlackSmall.png \ src/res/CLEDDisabledSmall.png \ src/res/CLEDGreen.png \ - src/res/CLEDGreenArrow.png \ src/res/CLEDGreenSmall.png \ src/res/CLEDGrey.png \ - src/res/CLEDGreyArrow.png \ src/res/CLEDGreySmall.png \ src/res/CLEDRed.png \ src/res/CLEDRedSmall.png \ @@ -783,6 +781,8 @@ DISTFILES += ChangeLog \ src/res/mixerboardbackground.png \ src/res/transparent1x1.png \ src/res/mutediconorange.png \ + src/res/servertrayiconactive.png \ + src/res/servertrayiconinactive.png \ src/res/instruments/accordeon.png \ src/res/instruments/aguitar.png \ src/res/instruments/bassguitar.png \ diff --git a/src/res/CLEDGreenArrow.png b/src/res/CLEDGreenArrow.png deleted file mode 100644 index 7307ba3774..0000000000 Binary files a/src/res/CLEDGreenArrow.png and /dev/null differ diff --git a/src/res/CLEDGreyArrow.png b/src/res/CLEDGreyArrow.png deleted file mode 100644 index 0c6e7b544f..0000000000 Binary files a/src/res/CLEDGreyArrow.png and /dev/null differ diff --git a/src/res/servertrayiconactive.png b/src/res/servertrayiconactive.png new file mode 100644 index 0000000000..326aea898a Binary files /dev/null and b/src/res/servertrayiconactive.png differ diff --git a/src/res/servertrayiconinactive.png b/src/res/servertrayiconinactive.png new file mode 100644 index 0000000000..1f106493b0 Binary files /dev/null and b/src/res/servertrayiconinactive.png differ diff --git a/src/resources.qrc b/src/resources.qrc index aa50b844c1..aead3fc138 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -35,9 +35,7 @@ res/CLEDDisabledSmall.png - res/CLEDGreenArrow.png res/CLEDGreenSmall.png - res/CLEDGreyArrow.png res/CLEDGreySmall.png res/CLEDRedSmall.png res/CLEDYellowSmall.png @@ -121,6 +119,8 @@ res/fronticon.png res/fronticonserver.png + res/servertrayiconactive.png + res/servertrayiconinactive.png res/flags/flagnone.png diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index 8d5e78ed07..becfbf4a9d 100644 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -29,8 +29,8 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b CBaseDlg ( parent, Qt::Window ), // use Qt::Window to get min/max window buttons pServer ( pNServP ), pSettings ( pNSetP ), - BitmapSystemTrayInactive ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreyArrow.png" ) ), - BitmapSystemTrayActive ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenArrow.png" ) ) + BitmapSystemTrayInactive ( QString::fromUtf8 ( ":/png/main/res/servertrayiconinactive.png" ) ), + BitmapSystemTrayActive ( QString::fromUtf8 ( ":/png/main/res/servertrayiconactive.png" ) ) { // check if system tray icon can be used bSystemTrayIconAvailable = SystemTrayIcon.isSystemTrayAvailable();