Skip to content

Server tray icon update #2231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ann0see merged 1 commit into from
Jan 10, 2022
Merged

Server tray icon update #2231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jamulus.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
Binary file removed src/res/CLEDGreenArrow.png
View file
Open in desktop
Binary file not shown.
Binary file removed src/res/CLEDGreyArrow.png
View file
Open in desktop
Binary file not shown.
Binary file added src/res/servertrayiconactive.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/res/servertrayiconinactive.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@

<qresource prefix="/png/LEDs">
<file>res/CLEDDisabledSmall.png</file>
<file>res/CLEDGreenArrow.png</file>
<file>res/CLEDGreenSmall.png</file>
<file>res/CLEDGreyArrow.png</file>
<file>res/CLEDGreySmall.png</file>
<file>res/CLEDRedSmall.png</file>
<file>res/CLEDYellowSmall.png</file>
Expand Down Expand Up @@ -121,6 +119,8 @@
<qresource prefix="/png/main">
<file>res/fronticon.png</file>
<file>res/fronticonserver.png</file>
<file>res/servertrayiconactive.png</file>
<file>res/servertrayiconinactive.png</file>
</qresource>
<qresource prefix="/png/flags">
<file>res/flags/flagnone.png</file>
Expand Down
4 changes: 2 additions & 2 deletions src/serverdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down