Rebrand to HooverHigh
This commit is contained in:
6
.gitignore
vendored
Normal file
6
.gitignore
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
build/
|
||||
obj-*
|
||||
CMakeFiles*
|
||||
src/dependencies/*
|
||||
debian/debhelper-build-stamp
|
||||
debian/.debhelper*
|
36
build.sh
Executable file
36
build.sh
Executable file
@@ -0,0 +1,36 @@
|
||||
#!/bin/bash
|
||||
|
||||
#Vars:
|
||||
buildmode="deb"
|
||||
|
||||
#Get mode:
|
||||
if [ ! -z "$1" ]; then
|
||||
if [ "$1" == "deb" ]; then
|
||||
buildmode="deb"
|
||||
elif [ "$1" == "imager" ]; then
|
||||
buildmode="make"
|
||||
fi
|
||||
fi
|
||||
|
||||
#Main:
|
||||
if [ "$buildmode" == "deb" ]; then
|
||||
echo "Building .deb"
|
||||
debuild -uc -us
|
||||
elif [ "$buildmode" == "make" ]; then
|
||||
echo "Building imager only"
|
||||
if [ ! -d "build" ]; then
|
||||
mkdir -p "build"
|
||||
fi
|
||||
cd build
|
||||
if [ -d "CMakeFiles" ]; then
|
||||
rm -r CMakeFiles
|
||||
fi
|
||||
echo "Configuring build"
|
||||
cmake ../src
|
||||
echo "Building"
|
||||
make
|
||||
cd ..
|
||||
else
|
||||
echo "Unkown build option: $1, valid options are: deb, imager"
|
||||
exit 1
|
||||
fi
|
@@ -9,6 +9,8 @@
|
||||
/* Imager info */
|
||||
#define IMAGER_NAME "HooverHigh Imager"
|
||||
#define IMAGER_VERSION "1.7.5"
|
||||
#define IMAGER_ORG "HooverHigh"
|
||||
#define IMAGER_DOMAIN "https://github.com/hooverhigh/hooverhigh-imager"
|
||||
|
||||
/* Repository URL */
|
||||
#define OSLIST_URL "https://server1.hooverhigh.ml/rpi/imaging_utility_list.json"
|
||||
|
BIN
src/icons/hooverhigh.png
Normal file
BIN
src/icons/hooverhigh.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 80 KiB |
@@ -282,7 +282,7 @@ void ImageWriter::startWrite()
|
||||
connect(_thread, SIGNAL(finalizing()), SLOT(onFinalizing()));
|
||||
connect(_thread, SIGNAL(preparationStatusUpdate(QString)), SLOT(onPreparationStatusUpdate(QString)));
|
||||
_thread->setVerifyEnabled(_verifyEnabled);
|
||||
_thread->setUserAgent(QString("Mozilla/5.0 %1/%2").arg(constantName().toUtf8()).arg(constantVersion()).toUtf8());
|
||||
_thread->setUserAgent(QString("Mozilla/5.0 %1/%2").arg(constantName()).arg(constantVersion()).toUtf8());
|
||||
_thread->setImageCustomization(_config, _cmdline, _firstrun, _cloudinit, _cloudinitNetwork, _initFormat);
|
||||
|
||||
if (!_expectedHash.isEmpty() && _cachedFileHash != _expectedHash && _cachingEnabled)
|
||||
|
@@ -85,11 +85,11 @@ int main(int argc, char *argv[])
|
||||
#else
|
||||
QApplication app(argc, argv);
|
||||
#endif
|
||||
app.setOrganizationName(imagewriter.constantOrg());
|
||||
app.setOrganizationDomain(imagewriter.constantDomain());
|
||||
app.setApplicationName(imagewriter.constantName());
|
||||
app.setWindowIcon(QIcon(":/icons/rpi-imager.ico"));
|
||||
ImageWriter imageWriter;
|
||||
app.setOrganizationName(imageWriter.constantOrg());
|
||||
app.setOrganizationDomain(imageWriter.constantDomain());
|
||||
app.setApplicationName(imageWriter.constantName());
|
||||
app.setWindowIcon(QIcon(":/icons/rpi-imager.ico"));
|
||||
NetworkAccessManagerFactory namf;
|
||||
QQmlApplicationEngine engine;
|
||||
QString customQm;
|
||||
|
17
src/main.qml
17
src/main.qml
@@ -64,7 +64,7 @@ ApplicationWindow {
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
||||
fillMode: Image.PreserveAspectFit
|
||||
source: "icons/logo_stacked_imager.png"
|
||||
source: "icons/hooverhigh.png"
|
||||
width: window.width
|
||||
height: window.height/2
|
||||
}
|
||||
@@ -516,13 +516,6 @@ ApplicationWindow {
|
||||
name: qsTr("Use custom")
|
||||
description: qsTr("Select a custom .img from your computer")
|
||||
}
|
||||
|
||||
ListElement {
|
||||
url: ""
|
||||
icon: "icons/use_custom.png"
|
||||
name: qsTr("Use custom")
|
||||
description: qsTr("Select a custom .img from a URL")
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
if (imageWriter.isOnline()) {
|
||||
@@ -1151,6 +1144,14 @@ ApplicationWindow {
|
||||
for (var i in oslist) {
|
||||
osmodel.insert(osmodel.count-2, oslist[i])
|
||||
}
|
||||
|
||||
if (imageWriter.isOnline()) {
|
||||
osmodel.insert(osmodel.count+1, '{
|
||||
"url": "internal://img_url",
|
||||
"icon": "icons/use_custom.png",
|
||||
"name": "Use custom",
|
||||
"description": "Select a custom .img from a URL"
|
||||
}')
|
||||
|
||||
if ("imager" in o) {
|
||||
var imager = o["imager"]
|
||||
|
@@ -32,6 +32,7 @@
|
||||
<file>icons/cat_language_specific_operating_systems.png</file>
|
||||
<file>icons/cat_3d_printing.png</file>
|
||||
<file>icons/logo_stacked_imager.png</file>
|
||||
<file>icons/hooverhigh.png</file>
|
||||
<file>qmlcomponents/ImButton.qml</file>
|
||||
<file>qmlcomponents/ImCheckBox.qml</file>
|
||||
<file>qmlcomponents/ImRadioButton.qml</file>
|
||||
|
Reference in New Issue
Block a user