mirror of
https://github.com/palera1n/palera1n.git
synced 2026-10-21 09:47:01 +02:00
fix(gui): use wxSP_WRAP on linux
This commit is contained in:
1 parent
1cd33432d9
commit
4cec4b0d4a
10 files changed
+37
-5
No files matched your search
@@ -329,8 +329,8 @@ jobs:
|
|||||||
mkdir -p palera1n-iphoneos-arm/DEBIAN
|
mkdir -p palera1n-iphoneos-arm/DEBIAN
|
||||||
tar -xf palera1n-iphoneos-arm64.tar.gz -C palera1n-iphoneos-arm64
|
tar -xf palera1n-iphoneos-arm64.tar.gz -C palera1n-iphoneos-arm64
|
||||||
tar -xf palera1n-iphoneos-arm.tar.gz -C palera1n-iphoneos-arm
|
tar -xf palera1n-iphoneos-arm.tar.gz -C palera1n-iphoneos-arm
|
||||||
cp ../packaging/control palera1n-iphoneos-arm64/DEBIAN/control
|
cp ../resources/control palera1n-iphoneos-arm64/DEBIAN/control
|
||||||
cp ../packaging/control palera1n-iphoneos-arm/DEBIAN/control
|
cp ../resources/control palera1n-iphoneos-arm/DEBIAN/control
|
||||||
|
|
||||||
VERSION=$(grep '^#define PALERAIN_VERSION' ../src/globals.h | cut -d'"' -f2 | tr -cd '0-9.')
|
VERSION=$(grep '^#define PALERAIN_VERSION' ../src/globals.h | cut -d'"' -f2 | tr -cd '0-9.')
|
||||||
|
|
||||||
@@ -388,8 +388,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
create-dmg \
|
create-dmg \
|
||||||
--volname "palera1n-macos-universal" \
|
--volname "palera1n-macos-universal" \
|
||||||
--volicon "packaging/drive.icns" \
|
--volicon "resources/drive.icns" \
|
||||||
--background "packaging/background.png" \
|
--background "resources/background.png" \
|
||||||
--window-pos 200 120 \
|
--window-pos 200 120 \
|
||||||
--window-size 510 350 \
|
--window-size 510 350 \
|
||||||
--icon-size 100 \
|
--icon-size 100 \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ embedded/binpack.dmg
|
|||||||
embedded/DFUHelperDeviceInfo-minified.json
|
embedded/DFUHelperDeviceInfo-minified.json
|
||||||
|
|
||||||
apple-include-*
|
apple-include-*
|
||||||
|
*-unknown-*
|
||||||
libusbK/
|
libusbK/
|
||||||
libusbK-tmp/
|
libusbK-tmp/
|
||||||
|
|
||||||
|
|||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -75,7 +75,11 @@ DfuPanel::DfuPanel(MainFrame* frame, wxWindow* parent)
|
|||||||
"Time to put the device into DFU mode.",
|
"Time to put the device into DFU mode.",
|
||||||
wxDefaultPosition,
|
wxDefaultPosition,
|
||||||
wxDefaultSize,
|
wxDefaultSize,
|
||||||
|
#ifdef __linux__
|
||||||
|
wxSP_WRAP
|
||||||
|
#else
|
||||||
wxST_WRAP
|
wxST_WRAP
|
||||||
|
#endif
|
||||||
);
|
);
|
||||||
left->Add(m_headerText, 0, wxTOP | wxLEFT | wxRIGHT, 10);
|
left->Add(m_headerText, 0, wxTOP | wxLEFT | wxRIGHT, 10);
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,11 @@ ExploitPanel::ExploitPanel(MainFrame* frame, wxWindow* parent)
|
|||||||
left->Add(new wxStaticText(this, wxID_ANY, "Installing jailbreak, this will take a moment. Do not disconnect the device until finished.",
|
left->Add(new wxStaticText(this, wxID_ANY, "Installing jailbreak, this will take a moment. Do not disconnect the device until finished.",
|
||||||
wxDefaultPosition,
|
wxDefaultPosition,
|
||||||
wxDefaultSize,
|
wxDefaultSize,
|
||||||
|
#ifdef __linux__
|
||||||
|
wxSP_WRAP
|
||||||
|
#else
|
||||||
wxST_WRAP
|
wxST_WRAP
|
||||||
|
#endif
|
||||||
), 0, wxALL, 10);
|
), 0, wxALL, 10);
|
||||||
left->Add(m_statusText, 0, wxALL, 10);
|
left->Add(m_statusText, 0, wxALL, 10);
|
||||||
left->Add(m_progressBar, 0, wxALL | wxEXPAND, 20);
|
left->Add(m_progressBar, 0, wxALL | wxEXPAND, 20);
|
||||||
|
|||||||
@@ -81,7 +81,11 @@ MainPanel::MainPanel(MainFrame* frame, wxWindow* parent)
|
|||||||
"Cameron Katri, Keto et al.)",
|
"Cameron Katri, Keto et al.)",
|
||||||
wxDefaultPosition,
|
wxDefaultPosition,
|
||||||
wxDefaultSize,
|
wxDefaultSize,
|
||||||
|
#ifdef __linux__
|
||||||
|
wxSP_WRAP
|
||||||
|
#else
|
||||||
wxST_WRAP
|
wxST_WRAP
|
||||||
|
#endif
|
||||||
);
|
);
|
||||||
|
|
||||||
auto* twitterLabel = new wxStaticText(this, wxID_ANY, "Twitter:");
|
auto* twitterLabel = new wxStaticText(this, wxID_ANY, "Twitter:");
|
||||||
@@ -167,7 +171,11 @@ MainPanel::MainPanel(MainFrame* frame, wxWindow* parent)
|
|||||||
"NOTE: Please ensure you've made a backup of your device before proceeding.\n",
|
"NOTE: Please ensure you've made a backup of your device before proceeding.\n",
|
||||||
wxDefaultPosition,
|
wxDefaultPosition,
|
||||||
wxDefaultSize,
|
wxDefaultSize,
|
||||||
|
#ifdef __linux__
|
||||||
|
wxSP_WRAP
|
||||||
|
#else
|
||||||
wxST_WRAP
|
wxST_WRAP
|
||||||
|
#endif
|
||||||
);
|
);
|
||||||
|
|
||||||
wxFont noteFont = warningNote->GetFont();
|
wxFont noteFont = warningNote->GetFont();
|
||||||
|
|||||||
@@ -88,7 +88,11 @@ RecoveryPanel::RecoveryPanel(MainFrame* frame, wxWindow* parent)
|
|||||||
"The device needs to be put into DFU mode to apply the jailbreak. This is a manual process and we will guide you through it.",
|
"The device needs to be put into DFU mode to apply the jailbreak. This is a manual process and we will guide you through it.",
|
||||||
wxDefaultPosition,
|
wxDefaultPosition,
|
||||||
wxDefaultSize,
|
wxDefaultSize,
|
||||||
|
#ifdef __linux__
|
||||||
|
wxSP_WRAP
|
||||||
|
#else
|
||||||
wxST_WRAP
|
wxST_WRAP
|
||||||
|
#endif
|
||||||
), 0, wxALL, 10);
|
), 0, wxALL, 10);
|
||||||
left->Add(m_statusText, 0, wxALL, 10);
|
left->Add(m_statusText, 0, wxALL, 10);
|
||||||
|
|
||||||
|
|||||||
@@ -58,7 +58,14 @@ auto createTitle = [](wxWindow* parent, const wxString& text)
|
|||||||
|
|
||||||
auto createDescription = [](wxWindow* parent, const wxString& text)
|
auto createDescription = [](wxWindow* parent, const wxString& text)
|
||||||
{
|
{
|
||||||
auto* description = new wxStaticText(parent, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, wxST_WRAP);
|
auto* description = new wxStaticText(
|
||||||
|
parent, wxID_ANY, text, wxDefaultPosition, wxDefaultSize,
|
||||||
|
#ifdef __linux__
|
||||||
|
wxSP_WRAP
|
||||||
|
#else
|
||||||
|
wxST_WRAP
|
||||||
|
#endif
|
||||||
|
);
|
||||||
|
|
||||||
wxFont font = description->GetFont();
|
wxFont font = description->GetFont();
|
||||||
font.SetPointSize(font.GetPointSize() - 2);
|
font.SetPointSize(font.GetPointSize() - 2);
|
||||||
@@ -85,7 +92,11 @@ SettingsPanel::SettingsPanel(MainFrame* frame, wxWindow* parent)
|
|||||||
"You may set the following options. If you don't know what they mean you'll probably have no reason to set them.",
|
"You may set the following options. If you don't know what they mean you'll probably have no reason to set them.",
|
||||||
wxDefaultPosition,
|
wxDefaultPosition,
|
||||||
wxDefaultSize,
|
wxDefaultSize,
|
||||||
|
#ifdef __linux__
|
||||||
|
wxSP_WRAP
|
||||||
|
#else
|
||||||
wxST_WRAP
|
wxST_WRAP
|
||||||
|
#endif
|
||||||
), 0, wxTOP | wxLEFT | wxRIGHT, 10);
|
), 0, wxTOP | wxLEFT | wxRIGHT, 10);
|
||||||
|
|
||||||
auto* notebook = new wxNotebook(this, wxID_ANY);
|
auto* notebook = new wxNotebook(this, wxID_ANY);
|
||||||
|
|||||||
Reference in new issue
Block a user