Skip to content

Commit

Permalink
Added icons
Browse files Browse the repository at this point in the history
  • Loading branch information
jackuess committed Jan 14, 2012
1 parent e5845d0 commit cd686d0
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 9 deletions.
Binary file added data/128x128/pirateplayer.png
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 data/16x16/pirateplayer.png
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 data/24x24/pirateplayer.png
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 data/256x256/pirateplayer.png
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 data/32x32/pirateplayer.png
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 data/48x48/pirateplayer.png
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 data/512x512/pirateplayer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions pirateplayer.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[Desktop Entry]
Type=Application
Name=Pirateplayer
Comment=Qt-based utility for watching and downloading swedish broadcasting
TryExec=pirateplayer
Exec=pirateplayer %F
Icon=pirateplayer
Binary file added pirateplayer.icns
Binary file not shown.
Binary file added pirateplayer.ico
Binary file not shown.
35 changes: 34 additions & 1 deletion pirateplayer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,48 @@ win32 {
INCLUDEPATH += /usr/include
INCLUDEPATH += "C:/Users/chucky/include"
LIBS += -L"C:/Program Files/rtmpdump-git" -lrtmp -lws2_32
RC_FILE = pirateplayer.rc
}
unix {
LIBS += -L/usr/lib/ -lrtmp
INCLUDEPATH += /usr/include
DEPENDPATH += /usr/include

isEmpty(PREFIX):PREFIX = /usr/local
DATADIR = $$PREFIX/share

target.path = $$PREFIX/bin

INSTALLS += target
INSTALLS += target \
desktop \
iconsvg \
icon16 \
icon32 \
icon48 \
#icon64 \
icon128 \
icon256 \
icon512

desktop.path = $$DATADIR/applications
desktop.files += pirateplayer.desktop

iconsvg.path = $$DATADIR/icons/hicolor/scalable/apps
iconsvg.files += data/pirateplayer.svg
icon16.path = $$DATADIR/icons/hicolor/16x16/apps
icon16.files += data/16x16/pirateplayer.png
icon32.path = $$DATADIR/icons/hicolor/32x32/apps
icon32.files += data/32x32/pirateplayer.png
icon48.path = $$DATADIR/icons/hicolor/48x48/apps
icon48.files += data/48x48/pirateplayer.png
#icon64.path = $$DATADIR/icons/hicolor/64x64/apps
#icon64.files += data/64x64/pirateplayer.png
icon128.path = $$DATADIR/icons/hicolor/128x128/apps
icon128.files += data/128x128/pirateplayer.png
icon256.path = $$DATADIR/icons/hicolor/256x256/apps
icon256.files += data/256x256/pirateplayer.png
icon512.path = $$DATADIR/icons/hicolor/512x512/apps
icon512.files += data/512x512/pirateplayer.png
}
mac {
#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
Expand All @@ -62,6 +94,7 @@ mac {
#LIBS += -L/usr/local/lib
#INCLUDEPATH += /usr/local/include
DEPENDPATH += /usr/local/include
ICON = pirateplayer.icns
}


Expand Down
1 change: 1 addition & 0 deletions pirateplayer.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "pirateplayer.ico"
15 changes: 8 additions & 7 deletions resources.qrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file>images/High-contrast-media-playback-pause.svg</file>
<file>images/High-contrast-multimedia-volume-control.svg</file>
<file>images/High-contrast-view-fullscreen.svg</file>
</qresource>
</RCC>
<RCC>
<qresource prefix="/">
<file>images/High-contrast-media-playback-pause.svg</file>
<file>images/High-contrast-multimedia-volume-control.svg</file>
<file>images/High-contrast-view-fullscreen.svg</file>
<file>data/16x16/pirateplayer.png</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ int main(int argc, char *argv[])
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
QApplication a(argc, argv);
a.setApplicationName("Pirateplayer");
a.setApplicationVersion("0.3");
a.setApplicationVersion("0.3.1");

QTranslator qtTranslator;
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
Expand Down
3 changes: 3 additions & 0 deletions src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@
#include <QDesktopServices>
#include <QVBoxLayout>
#include <QtWebKit>
#include <qglobal.h>

MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
{
networkAccessManager = new PirateNetworkAccessManager(this);

setWindowIcon(QIcon(":/data/16x16/pirateplayer.png"));

ui->setupUi(this);

ui->browser->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
Expand Down

0 comments on commit cd686d0

Please sign in to comment.