Compare commits
No commits in common. "a62ffc41adbcacca0b6a406abb05d3f1c42eccdc" and "d13231e84ef7494cfa57a45a11785f05cf1f28ac" have entirely different histories.
a62ffc41ad
...
d13231e84e
|
@ -1,188 +0,0 @@
|
||||||
name: Build and Package AppImage, Windows Executable, and macOS DMG
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
tags:
|
|
||||||
- 'v*'
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-linux:
|
|
||||||
runs-on: ubuntu-20.04
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Set up CMake
|
|
||||||
uses: lukka/get-cmake@latest
|
|
||||||
with:
|
|
||||||
cmakeVersion: '3.22.0'
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y \
|
|
||||||
build-essential \
|
|
||||||
libssl-dev \
|
|
||||||
libx11-dev \
|
|
||||||
libxext-dev \
|
|
||||||
libxrandr-dev \
|
|
||||||
libxinerama-dev \
|
|
||||||
libxcursor-dev \
|
|
||||||
zlib1g-dev \
|
|
||||||
libglu1-mesa-dev \
|
|
||||||
libgtk-3-dev \
|
|
||||||
libwayland-dev \
|
|
||||||
fuse
|
|
||||||
sudo modprobe fuse
|
|
||||||
|
|
||||||
- name: Configure with CMake
|
|
||||||
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
|
||||||
|
|
||||||
- name: Build the project
|
|
||||||
run: cmake --build build --config Release
|
|
||||||
|
|
||||||
- name: Download linuxdeploy
|
|
||||||
run: |
|
|
||||||
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
|
|
||||||
chmod +x linuxdeploy-x86_64.AppImage
|
|
||||||
sudo mv linuxdeploy-x86_64.AppImage /usr/local/bin/linuxdeploy
|
|
||||||
|
|
||||||
- name: Create AppImage
|
|
||||||
run: |
|
|
||||||
cp -r build/PlayerLink linux/AppDir/usr/bin/
|
|
||||||
linuxdeploy --appdir=linux/AppDir --output appimage
|
|
||||||
|
|
||||||
- name: Upload AppImage artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: PlayerLink-AppImage
|
|
||||||
path: ./*.AppImage
|
|
||||||
|
|
||||||
build-windows:
|
|
||||||
runs-on: windows-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Set up CMake
|
|
||||||
uses: lukka/get-cmake@latest
|
|
||||||
with:
|
|
||||||
cmakeVersion: '3.22.0'
|
|
||||||
|
|
||||||
- name: Configure with CMake
|
|
||||||
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
|
||||||
|
|
||||||
- name: Build the project
|
|
||||||
run: cmake --build build --config Release
|
|
||||||
|
|
||||||
- name: Upload Windows artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: PlayerLink-Windows-Executable
|
|
||||||
path: build/Release/*
|
|
||||||
|
|
||||||
build-macos:
|
|
||||||
runs-on: macos-15
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Set up CMake
|
|
||||||
uses: lukka/get-cmake@latest
|
|
||||||
with:
|
|
||||||
cmakeVersion: '3.22.0'
|
|
||||||
|
|
||||||
- name: Configure with CMake
|
|
||||||
run: cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
|
|
||||||
|
|
||||||
- name: Build the project
|
|
||||||
run: cmake --build build --config Release
|
|
||||||
|
|
||||||
- name: Create DMG package
|
|
||||||
run: |
|
|
||||||
mkdir -p dmg/PlayerLink
|
|
||||||
cp -r build/PlayerLink.app dmg/PlayerLink/
|
|
||||||
hdiutil create -volname "PlayerLink" -srcfolder dmg/PlayerLink -ov -format UDZO PlayerLink.dmg
|
|
||||||
|
|
||||||
- name: Upload macOS DMG artifact
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: PlayerLink-macOS-DMG
|
|
||||||
path: PlayerLink.dmg
|
|
||||||
|
|
||||||
create-release:
|
|
||||||
needs: [build-linux, build-windows, build-macos]
|
|
||||||
runs-on: ubuntu-20.04
|
|
||||||
steps:
|
|
||||||
- name: Download AppImage artifact
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: PlayerLink-AppImage
|
|
||||||
path: ./release-assets
|
|
||||||
|
|
||||||
- name: Download Windows artifact
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: PlayerLink-Windows-Executable
|
|
||||||
path: ./release-assets
|
|
||||||
|
|
||||||
- name: Download macOS DMG artifact
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: PlayerLink-macOS-DMG
|
|
||||||
path: ./release-assets
|
|
||||||
|
|
||||||
- name: Create GitHub Release
|
|
||||||
uses: actions/create-release@v1
|
|
||||||
id: create_release
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
tag_name: ${{ github.ref_name }}
|
|
||||||
release_name: Release ${{ github.ref_name }}
|
|
||||||
draft: false
|
|
||||||
prerelease: false
|
|
||||||
- name: Upload AppImage
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
|
||||||
asset_path: ./release-assets/*.AppImage
|
|
||||||
asset_name: PlayerLink.AppImage
|
|
||||||
asset_content_type: application/octet-stream
|
|
||||||
|
|
||||||
- name: Upload Windows Executable
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
|
||||||
asset_path: path_to_your_windows_executable
|
|
||||||
asset_name: ./release-assets/*.exe
|
|
||||||
asset_content_type: application/octet-stream
|
|
||||||
|
|
||||||
- name: Upload macOS DMG
|
|
||||||
uses: actions/upload-release-asset@v1
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
|
||||||
asset_path: ./release-assets/*.dmg
|
|
||||||
asset_name: PlayerLink.dmg
|
|
||||||
asset_content_type: application/octet-stream
|
|
|
@ -3,10 +3,4 @@ build/*
|
||||||
.cache/*
|
.cache/*
|
||||||
src/rsrc.hpp
|
src/rsrc.hpp
|
||||||
PlayerLink.exe
|
PlayerLink.exe
|
||||||
.vscode/*
|
.vscode/*
|
||||||
linux/AppDir/usr/share/doc/*
|
|
||||||
linux/AppDir/usr/lib/*
|
|
||||||
linux/AppDir/usr/bin/*
|
|
||||||
linux/AppDir/*
|
|
||||||
!linux/AppDir/usr
|
|
||||||
!.gitkeep
|
|
|
@ -1,6 +0,0 @@
|
||||||
[Desktop Entry]
|
|
||||||
Name=PlayerLink
|
|
||||||
Exec=PlayerLink
|
|
||||||
Icon=PlayerLink
|
|
||||||
Type=Application
|
|
||||||
Categories=Utility;GTK;
|
|
Binary file not shown.
Before Width: | Height: | Size: 285 KiB |
|
@ -11,6 +11,7 @@
|
||||||
#include <winrt/windows.storage.streams.h>
|
#include <winrt/windows.storage.streams.h>
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <codecvt>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
|
||||||
#include "../backend.hpp"
|
#include "../backend.hpp"
|
||||||
|
|
34
src/main.cpp
34
src/main.cpp
|
@ -184,37 +184,30 @@ public:
|
||||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||||
long style = 0, const wxValidator& validator = wxDefaultValidator,
|
long style = 0, const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = "textCtrl")
|
const wxString& name = "textCtrl")
|
||||||
: wxTextCtrl(parent, id, value, pos, size, style, validator, name),
|
: wxTextCtrl(parent, id, value, pos, size, style, validator, name), placeholder(""), showPlaceholder(true) {
|
||||||
placeholder(""),
|
|
||||||
showPlaceholder(true),
|
|
||||||
isPassword((style & wxTE_PASSWORD) != 0) {
|
|
||||||
|
|
||||||
Bind(wxEVT_SET_FOCUS, &wxTextCtrlWithPlaceholder::OnFocus, this);
|
Bind(wxEVT_SET_FOCUS, &wxTextCtrlWithPlaceholder::OnFocus, this);
|
||||||
Bind(wxEVT_KILL_FOCUS, &wxTextCtrlWithPlaceholder::OnBlur, this);
|
Bind(wxEVT_KILL_FOCUS, &wxTextCtrlWithPlaceholder::OnBlur, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetPlaceholderText(const wxString& p) {
|
void SetPlaceholderText(const wxString& p) {
|
||||||
placeholder = p;
|
placeholder = p;
|
||||||
if (GetValue().IsEmpty() || showPlaceholder)
|
SetValue(placeholder);
|
||||||
UpdatePlaceholder();
|
Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void OnFocus(wxFocusEvent& event) {
|
void OnFocus(wxFocusEvent& event) {
|
||||||
if (showPlaceholder && GetValue() == placeholder) {
|
if (GetValue() == placeholder)
|
||||||
Clear();
|
Clear();
|
||||||
if (isPassword)
|
|
||||||
SetStyleToPassword();
|
|
||||||
}
|
|
||||||
|
|
||||||
showPlaceholder = false;
|
showPlaceholder = false;
|
||||||
event.Skip();
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnBlur(wxFocusEvent& event) {
|
void OnBlur(wxFocusEvent& event) {
|
||||||
if (GetValue().IsEmpty()) {
|
if (GetValue().IsEmpty() || GetValue() == "") {
|
||||||
|
SetValue(placeholder);
|
||||||
showPlaceholder = true;
|
showPlaceholder = true;
|
||||||
UpdatePlaceholder();
|
|
||||||
}
|
}
|
||||||
event.Skip();
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
@ -222,21 +215,6 @@ protected:
|
||||||
private:
|
private:
|
||||||
wxString placeholder;
|
wxString placeholder;
|
||||||
bool showPlaceholder;
|
bool showPlaceholder;
|
||||||
bool isPassword;
|
|
||||||
|
|
||||||
void UpdatePlaceholder() {
|
|
||||||
if (isPassword)
|
|
||||||
SetStyleToNormal();
|
|
||||||
SetValue(placeholder);
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetStyleToPassword() {
|
|
||||||
SetWindowStyle(GetWindowStyle() | wxTE_PASSWORD);
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetStyleToNormal() {
|
|
||||||
SetWindowStyle(GetWindowStyle() & ~wxTE_PASSWORD);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class PlayerLinkFrame : public wxFrame {
|
class PlayerLinkFrame : public wxFrame {
|
||||||
|
|
Loading…
Reference in New Issue