Skip to content

Commit cb41055

Browse files
7bitcoder7bitcoder
committed
final bugs fix + incons added to programs
1 parent 2a3a6e2 commit cb41055

22 files changed

+97
-9
lines changed

‎LaunchBox/CMakeSettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"variables": [
3737
{
3838
"name": "AUTO_QT_LIBS",
39-
"value": "True",
39+
"value": "False",
4040
"type": "BOOL"
4141
},
4242
{

‎LaunchBox/Gui/LaunchBox.qmlproject.qtds

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtDesignStudio 1.5.0, 2020-07-22T21:40:10. -->
3+
<!-- Written by QtDesignStudio 1.5.0, 2020-07-23T18:21:02. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>

‎LaunchBox/Source/App/App/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@ target_include_directories(LaunchBox PUBLIC
4747
"../QLoadingBar"
4848
"../QLoadingBar/h")
4949

50+
file( COPY ${CMAKE_SOURCE_DIR}/orbit2.ico DESTINATION ${CMAKE_BINARY_DIR} )
5051

5152
install(TARGETS LaunchBox DESTINATION ${LaunchBoxPath}/bin)

‎LaunchBox/Source/App/App/main.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
#include <QGuiApplication>
1+
#include <QGuiApplication>
22
#include <QQmlApplicationEngine>
33
#include <QQmlContext>
44
#include <QVariant>
5+
#include <QIcon>
56
#include "Backend.hpp"
67

78
int main(int argc, char** argv) {
89
//responsible is more efficient but animations are too fast
910
//QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
1011
QGuiApplication app(argc, argv);
12+
app.setWindowIcon(QIcon("orbit2.ico"));
1113
QQmlApplicationEngine engine;
1214

1315
bc::Backend backend(&engine);
@@ -16,4 +18,4 @@ int main(int argc, char** argv) {
1618

1719
engine.load("qrc:/LaunchBox.qml");
1820
return app.exec();
19-
}
21+
}

‎LaunchBox/Source/AppLauncher/.vs/Launcher/DesignTimeBuild/.dtbcache.v2

0 Bytes
Binary file not shown.

‎LaunchBox/Source/AppLauncher/.vs/Launcher/v16/.suo

18 KB
Binary file not shown.

‎LaunchBox/Source/AppLauncher/Launcher.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
6-
<ApplicationIcon>orbit.ico</ApplicationIcon>
6+
<ApplicationIcon>orbit2.ico</ApplicationIcon>
7+
<ApplicationManifest>app.manifest</ApplicationManifest>
78
</PropertyGroup>
89

910
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

‎LaunchBox/Source/AppLauncher/app.manifest

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
4+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5+
<security>
6+
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7+
<!-- Opcje manifestu Kontroli konta użytkownika
8+
Jeśli chcesz zmienić poziom Kontroli konta użytkownika systemu Windows, zastąp
9+
węzeł requestedExecutionLevel jednym z następujących.
10+
11+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
12+
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
13+
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
14+
15+
Określenie elementu requestedExecutionLevel spowoduje wyłączenie wirtualizacji plików i rejestru.
16+
Usuń ten element, jeśli aplikacja wymaga wirtualizacji w celu zachowania
17+
zgodności z poprzednimi wersjami.
18+
-->
19+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
20+
</requestedPrivileges>
21+
</security>
22+
</trustInfo>
23+
24+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
25+
<application>
26+
<!-- Lista wersji systemu Windows, na których ta aplikacja została przetestowana
27+
i dla których została zaprojektowana. Odkomentuj odpowiednie elementy, a system Windows
28+
automatycznie wybierze najbardziej zgodne środowisko. -->
29+
30+
<!-- Windows Vista -->
31+
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
32+
33+
<!-- Windows 7 -->
34+
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
35+
36+
<!-- Windows 8 -->
37+
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
38+
39+
<!-- Windows 8.1 -->
40+
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
41+
42+
<!-- Windows 10 -->
43+
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
44+
45+
</application>
46+
</compatibility>
47+
48+
<!-- Wskazuje, że aplikacja rozpoznaje wartości DPI i nie będzie automatycznie skalowana przez system Windows przy dużych
49+
wartościach DPI. Aplikacje korzystające z technologii Windows Presentation Foundation (WPF) automatycznie rozpoznają wartości DPI i nie potrzebują
50+
tej opcji. Aplikacje korzystające z technologii Windows Forms przeznaczone dla platformy .NET Framework 4.6, które korzystają z tej opcji, powinny
51+
ustawić także wartość „true” dla parametru „EnableWindowsFormsHighDpiAutoResizing” w pliku app.config. -->
52+
<!--
53+
<application xmlns="urn:schemas-microsoft-com:asm.v3">
54+
<windowsSettings>
55+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
56+
</windowsSettings>
57+
</application>
58+
-->
59+
60+
<!-- Włącz motywy dla typowych formantów systemu Windows i okien dialogowych (system Windows XP i nowsze) -->
61+
<!--
62+
<dependency>
63+
<dependentAssembly>
64+
<assemblyIdentity
65+
type="win32"
66+
name="Microsoft.Windows.Common-Controls"
67+
version="6.0.0.0"
68+
processorArchitecture="*"
69+
publicKeyToken="6595b64144ccf1df"
70+
language="*"
71+
/>
72+
</dependentAssembly>
73+
</dependency>
74+
-->
75+
76+
</assembly>

‎LaunchBox/Source/AppLauncher/favicon.ico

-122 KB
Binary file not shown.

‎LaunchBox/Source/AppLauncher/obj/Release/netcoreapp3.1/Launcher.csproj.FileListAbsolute.txt

+1
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ C:\Users\Sylwester\Desktop\LaunchBox\LaunchBox\Source\AppLauncher\obj\Release\ne
2323
C:\Users\Sylwester\Desktop\LaunchBox\LaunchBox\Source\AppLauncher\obj\Release\netcoreapp3.1\Launcher.dll
2424
C:\Users\Sylwester\Desktop\LaunchBox\LaunchBox\Source\AppLauncher\obj\Release\netcoreapp3.1\Launcher.pdb
2525
C:\Users\Sylwester\Desktop\LaunchBox\LaunchBox\Source\AppLauncher\obj\Release\netcoreapp3.1\Launcher.genruntimeconfig.cache
26+
C:\Users\Sylwester\Desktop\LaunchBox\LaunchBox\Source\AppLauncher\obj\Release\netcoreapp3.1\Launcher.csprojAssemblyReference.cache

‎LaunchBox/Source/AppLauncher/obj/Release/netcoreapp3.1/Launcher.csprojAssemblyReference.cache

424 Bytes
Binary file not shown.

‎LaunchBox/Source/AppLauncher/obj/Release/netcoreapp3.1/Launcher.dll

225 KB
Binary file not shown.

‎LaunchBox/Source/AppLauncher/obj/Release/netcoreapp3.1/Launcher.exe

225 KB
Binary file not shown.

‎LaunchBox/Source/AppLauncher/orbit2.ico

352 KB
Binary file not shown.

‎LaunchBox/Source/AppUpdater/AppUpdadter/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ target_include_directories(Updater PUBLIC
3939
"../../Component/h")
4040

4141
set_target_properties(Updater PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Updater")
42+
file( COPY ${CMAKE_SOURCE_DIR}/orbit2.ico DESTINATION "${CMAKE_BINARY_DIR}/Updater" )
4243

4344

4445
install(TARGETS Updater DESTINATION ${UpdaterPath}/Updater)

‎LaunchBox/Source/AppUpdater/AppUpdadter/main.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#include <QGuiApplication>
1+
#include <QGuiApplication>
22
#include <QQmlApplicationEngine>
33
#include <QQmlContext>
4+
#include <QIcon>
45
#include <QVariant>
56
#include <fstream>
67
#include <iostream>
@@ -10,6 +11,7 @@ int main(int argc, char** argv) {
1011
//responsible is more efficient but animations are too fast
1112
//QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
1213
QGuiApplication app(argc, argv);
14+
app.setWindowIcon(QIcon("orbit2.ico"));
1315
QQmlApplicationEngine engine;
1416

1517
bc::Backend backend(&engine);
@@ -19,4 +21,4 @@ int main(int argc, char** argv) {
1921
engine.load("qrc:/AppUpdater.qml");
2022
//_sleep(10000);
2123
return app.exec();
22-
}
24+
}

‎LaunchBox/orbit.ico

-130 KB
Binary file not shown.

‎LaunchBox/orbit2.ico

352 KB
Binary file not shown.

‎Patcher/Gui/LaunchBox.qmlproject.qtds

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtDesignStudio 1.5.0, 2020-07-22T21:40:10. -->
3+
<!-- Written by QtDesignStudio 1.5.0, 2020-07-23T18:21:02. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>

‎Patcher/Source/DirTree/TreeModel.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ namespace dt {
146146

147147
st::setUpModel setUp_;
148148
bool available_ = false;
149-
std::string packetName_ = std::string("packet") + std::to_string(index_++) + ".zip-";
149+
std::string packetName_ = std::string("packet") + std::to_string(index_++) + ".zip";
150150
bool load_ = false;
151151
};
152152
}

‎Patcher/Source/DirTree/setUpTreeModel.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@ namespace st {
5656
actual_++;
5757
if (path.is_directory()) {
5858
auto* appended = parent->appendChildren({ p.filename().generic_string().c_str(), p.generic_string().c_str() }, true, "", 0);
59+
appended->setState(dt::TreeItem::fileState::ADDED);
5960
setupModelData(p, appended);
6061
} else {
6162
auto data = fileChecksum(path.path().generic_string().c_str(), QCryptographicHash::Algorithm::RealSha3_256);
6263
auto* appended = parent->appendChildren({ p.filename().generic_string().c_str(), p.generic_string().c_str() }, false, data.first, data.second);
64+
appended->setState(dt::TreeItem::fileState::ADDED);
6365
}
6466
}
6567
}

‎Patcher/Source/Project/Project.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ namespace pr {
181181
object.insert(fullPath.filename().c_str(), file);
182182
packer_.write(fullPath.generic_string(), child->path().toStdString(), child->isDirectory());
183183
rootObject_->insert(child->path(), fileList);
184+
} else {
185+
int ff = 0;
184186
}
185187
switch (child->getState()) {
186188
case dt::TreeItem::fileState::ADDED:

0 commit comments

Comments
 (0)