Skip to content

Commit

Permalink
Prepare for a release...
Browse files Browse the repository at this point in the history
  • Loading branch information
pontaoski committed Nov 17, 2020
1 parent b82078b commit b6e2dac
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 2 deletions.
15 changes: 15 additions & 0 deletions Murmur.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,21 @@ QtApplication {
"resources/data.qrc"
]

Group {
files: ["resources/com.github.harmony-development.Murmur.svg"]
qbs.install: qbs.targetOS.contains("linux")
qbs.installDir: "share/icons/hicolor/scalable/apps"
}

Group {
files: ["com.github.harmony-development.Murmur.desktop"]
qbs.install: qbs.targetOS.contains("linux")
qbs.installDir: "share/applications"
}

qbs.install: qbs.targetOS.contains("linux")
qbs.installDir: "bin"

Group {
name: "Translation files"
files: ["po/*.ts"]
Expand Down
7 changes: 7 additions & 0 deletions com.github.harmony-development.Murmur.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[Desktop Entry]
Type=Application
Name=Murmur
Exec=Murmur
Comment=Harmony client
GenericName=Chat Application
Icon=com.github.harmony-development.Murmur.svg
7 changes: 7 additions & 0 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <QApplication>
#include <QCoreApplication>
#include <QIcon>
#include <QQmlApplicationEngine>
#include <QQmlContext>
#include <QQuickStyle>
Expand Down Expand Up @@ -37,6 +38,12 @@ int main(int argc, char *argv[])
murmurTranslator.load("Murmur_" + QLocale::system().name(), ":/po/");
app->installTranslator(&murmurTranslator);

QApplication::setWindowIcon(QIcon::fromTheme(QString("com.github.harmony-development.Murmur")));
QApplication::setDesktopFileName("com.github.harmony-development.Murmur.desktop");
QApplication::setStyle("Breeze");
QIcon::setThemeName("breeze");
QQuickStyle::setStyle("org.kde.desktop");

QQmlApplicationEngine engine;
const QUrl url(QStringLiteral("qrc:/main.qml"));
QObject::connect(
Expand Down
2 changes: 1 addition & 1 deletion resources/LoginRoute.qml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Kirigami.PageRoute {
anchors.centerIn: parent

Image {
source: "qrc:/img/com.github.Harmony.Murmur.svg"
source: "qrc:/img/com.github.harmony-development.Murmur.svg"
sourceSize {
width: Layout.preferredWidth
height: Layout.preferredWidth
Expand Down
File renamed without changes
2 changes: 1 addition & 1 deletion resources/data.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<file>qmldir</file>
</qresource>
<qresource prefix="/img">
<file>com.github.Harmony.Murmur.svg</file>
<file>com.github.harmony-development.Murmur.svg</file>
</qresource>
</RCC>

0 comments on commit b6e2dac

Please sign in to comment.