Skip to content

Commit

Permalink
ported to online installer
Browse files Browse the repository at this point in the history
  • Loading branch information
Deadbush225 committed Oct 6, 2024
1 parent 50a1b46 commit e2d4682
Show file tree
Hide file tree
Showing 30 changed files with 475 additions and 247 deletions.
Binary file modified packages/com.vendor.root/data/bin/Printing Rates.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 2 additions & 3 deletions packages/com.vendor.root/meta/AddMenuShortcut.qs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Component.prototype.createOperations = function()

if (systemInfo.productType === "windows") {
component.addOperation("CreateShortcut", "@TargetDir@/bin/Printing Rates.exe", "@StartMenuDir@/Printing Rates.lnk",
"workingDirectory=@TargetDir@", "iconPath=%SystemRoot%/system32/SHELL32.dll",
"iconId=2", "description=Open README file");
"workingDirectory=@TargetDir@", "description=Open Printing Rates");
}
}
}
2 changes: 1 addition & 1 deletion packages/com.vendor.root/meta/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Package>
<DisplayName>Printing Rates</DisplayName>
<DisplayName>Download Sorter</DisplayName>
<Description>Main program</Description>
<Version>0.1.0-1</Version>
<ReleaseDate>2019-09-21</ReleaseDate>
Expand Down
Binary file added repository/2024-10-06-1212_meta.7z
Binary file not shown.
23 changes: 23 additions & 0 deletions repository/Updates.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Updates>
<ApplicationName>{AnyApplication}</ApplicationName>
<ApplicationVersion>1.0.0</ApplicationVersion>
<Checksum>true</Checksum>
<PackageUpdate>
<Name>com.vendor.root</Name>
<DisplayName>Download Sorter</DisplayName>
<Description>Main program</Description>
<Version>0.1.0-1</Version>
<ReleaseDate>2019-09-21</ReleaseDate>
<Default>script</Default>
<Script>AddMenuShortcut.qs</Script>
<UpdateFile CompressedSize="16676097" OS="Any" UncompressedSize="59915669"/>
<DownloadableArchives>bin.7z,translations.7z</DownloadableArchives>
<UserInterfaces>page.ui</UserInterfaces>
<Licenses>
<License file="license.txt" name="Beer Public License Agreement"/>
</Licenses>
<SHA1>5f6ecb53d8c5d7b2f1147a0ebc2458623eeac83c</SHA1>
</PackageUpdate>
<SHA1>1cb2f2dd45510c670c88c1331e237eeb77e44302</SHA1>
<MetadataName>2024-10-06-1212_meta.7z</MetadataName>
</Updates>
Binary file added repository/com.vendor.root/0.1.0-1bin.7z
Binary file not shown.
1 change: 1 addition & 0 deletions repository/com.vendor.root/0.1.0-1bin.7z.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bf5eb00e0d10fe7c3a09157a43ddc8e3ec66d916
Binary file added repository/com.vendor.root/0.1.0-1meta.7z
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions repository/com.vendor.root/0.1.0-1translations.7z.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4a03893a8665f0c23078171d4f8406bcceb033ce
12 changes: 5 additions & 7 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


cmake_minimum_required(VERSION 3.16)
project(PrintingRates VERSION 0.1.0)

Expand All @@ -22,15 +20,14 @@ qt_standard_project_setup()

file(GLOB_RECURSE UTILS "*.cpp")
file(GLOB_RECURSE HEADER "*.h")
file(GLOB_RECURSE InstallerConfigs "../config/*.*")
file(GLOB_RECURSE Packages "../packages/*.*")

set(SOURCE_FILES
${UTILS}
${HEADER}
# main.cpp
# DashboardWidget.cpp
# ModQMap.cpp
# ModQComboBox.cpp
# FixedLabel.cpp
${InstallerConfigs}
${Packages}
)

# set(app_icon_resource_windows "${CMAKE_CURRENT_SOURCE_DIR}/resources/photosurface.rc")
Expand Down Expand Up @@ -86,6 +83,7 @@ elseif(WIN32)
set(executable_path "\${QT_DEPLOY_BIN_DIR}/$<TARGET_FILE_NAME:${PROJECT_NAME}>")
else()
set(executable_path "\${QT_DEPLOY_BIN_DIR}/$<TARGET_FILE_NAME:${PROJECT_NAME}>")
set(STATUS "UNIX Based SYSTEM")
endif()

set(deploy_script "${CMAKE_CURRENT_BINARY_DIR}/deploy_${PROJECT_NAME}.cmake")
Expand Down
243 changes: 10 additions & 233 deletions src/CMakeLists.txt.user

Large diffs are not rendered by default.

428 changes: 428 additions & 0 deletions src/CMakeLists.txt.user.ad7e4ef

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/DashboardWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ DashboardWidget::DashboardWidget(QWidget* parent) : QWidget(parent) {

QPushButton* calculate_btn = new QPushButton("Calculate");

QObject::connect(calculate_btn, &QPushButton::clicked, this,
&DashboardWidget::calculate);
// QObject::connect(calculate_btn, &QPushButton::clicked, this,
// &DashboardWidget::calculate);

mainlayout->addLayout(button_lyt);
mainlayout->addWidget(this->tb);
Expand Down
1 change: 1 addition & 0 deletions src/Utils/ModQTableWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ ModQTableWidget::ModQTableWidget(/* args */) : QTableWidget() {
// std::function<void()>(std::bind(ModQTableWidget::mapChange, this)));

// CONSTANTS
// MOVE THIS TO SETTINGS MANIPULATOR
this->contentType_Map["Photo"] = QList<int>({10, 9, 8, 7, 6, 6});
this->contentType_Map["Text"] = QList<int>({5, 5, 4, 4, 3, 3});
this->contentType_Map["Text \\w Photo"] = QList<int>({8, 7, 6, 5, 4, 4});
Expand Down
Binary file modified src/icons/Printing Rates.ico
Binary file not shown.
Binary file modified src/icons/Printing Rates.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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* arg[]) {
auto app = QApplication(argc, arg);

QApplication::setStyle("Fusion");
QApplication::setWindowIcon(QIcon(":/Icons/Rephraser.png"));
QApplication::setWindowIcon(QIcon(":/Icons/Printing Rates.png"));

// # Now use a palette to switch to dark colors:
QPalette* dark_palette = new QPalette();
Expand Down

0 comments on commit e2d4682

Please sign in to comment.