frogmc/leapfrog
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Restructure, UI tweaks

Browse source
This commit is contained in:
TheKodeToad 2024-06-18 21:38:40 +01:00
parent 6052530efc
commit 586618f1ac
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
5 changed files with 1048 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
installer/CMakeLists.txt
View file

@ -3,16 +3,16 @@ add_executable(installer main.cpp ui.cpp ui.hpp meta.cpp meta.hpp info.hpp)
configure_file(info.hpp.in info.hpp) configure_file(info.hpp.in info.hpp)
# From https://docs.wxwidgets.org/latest/overview_cmake.html # From https://docs.wxwidgets.org/latest/overview_cmake.html
set(XRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/InstallerFrame_UI.xrc) set(XRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/InstallerFrame_UI.xrc)
set(WXRC $<TARGET_FILE:wxrc>) set(WXRC $<TARGET_FILE:wxrc>)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resources.cpp ${CMAKE_CURRENT_BINARY_DIR}/resources.h OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.cpp ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.h
COMMAND ${WXRC} -c -e -o ${CMAKE_CURRENT_BINARY_DIR}/resources.cpp ${XRC_FILES} COMMAND ${WXRC} -c -e -o ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.cpp ${XRC_FILES}
DEPENDS ${XRC_FILES} DEPENDS ${XRC_FILES}
DEPENDS wxrc DEPENDS wxrc
COMMENT "Compiling XRC resources" COMMENT "Compiling XRC resources"
) )
target_sources(installer PRIVATE resources.cpp resources.h) target_sources(installer PRIVATE resources/resources.cpp resources/resources.h)
target_link_libraries(installer PRIVATE wx::base wx::core wx::net wx::xrc) target_link_libraries(installer PRIVATE wx::base wx::core wx::net wx::xrc)
include_directories(lib/wx/include) include_directories(lib/wx/include)

1016
installer/resources/InstallerFrame_UI.fbp Normal file
View file

File diff suppressed because it is too large Load diff

35
installer/InstallerFrame_UI.xrc → installer/resources/InstallerFrame_UI.xrc
View file

@ -1,19 +1,34 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0"> <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
<object class="wxFrame" name="InstallerFrame_UI"> <object class="wxFrame" name="InstallerFrame_UI">
<size>500,500</size> <size>500,450</size>
<style>wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL</style> <style>wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL</style>
<title></title> <title>FrogLoader Installer</title>
<centered>1</centered> <centered>1</centered>
<aui_managed>0</aui_managed> <aui_managed>0</aui_managed>
<object class="wxBoxSizer" name="content"> <object class="wxBoxSizer" name="content">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND|wxFIXED_MINSIZE</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
<option>1</option> <option>1</option>
<object class="wxBoxSizer" name="options"> <object class="wxBoxSizer" name="options">
<orient>wxVERTICAL</orient> <orient>wxVERTICAL</orient>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<option>0</option>
<object class="wxStaticText" name="heading">
<font>
<style>normal</style>
<weight>bold</weight>
<family>default</family>
<underlined>0</underlined>
</font>
<label>Install FrogLoader Client</label>
<wrap>-1</wrap>
</object>
</object>
<object class="sizeritem"> <object class="sizeritem">
<flag>wxALL</flag> <flag>wxALL</flag>
<border>5</border> <border>5</border>
@ -27,7 +42,7 @@
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
<option>0</option> <option>0</option>
<object class="wxChoice" name="m_choice1"> <object class="wxChoice" name="version_choice">
<selection>0</selection> <selection>0</selection>
<content/> <content/>
</object> </object>
@ -60,8 +75,8 @@
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag> <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border> <border>5</border>
<option>0</option> <option>0</option>
<object class="wxButton" name="launcher_data_dir_select"> <object class="wxButton" name="launcher_data_dir_browse">
<label>Select</label> <label>Browse</label>
<default>0</default> <default>0</default>
<auth_needed>0</auth_needed> <auth_needed>0</auth_needed>
<markup>0</markup> <markup>0</markup>
@ -129,8 +144,8 @@
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag> <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border> <border>5</border>
<option>0</option> <option>0</option>
<object class="wxButton" name="game_data_dir_select"> <object class="wxButton" name="game_data_dir_browse">
<label>Select</label> <label>Browse</label>
<default>0</default> <default>0</default>
<auth_needed>0</auth_needed> <auth_needed>0</auth_needed>
<markup>0</markup> <markup>0</markup>
@ -161,7 +176,7 @@
<flag>wxALL</flag> <flag>wxALL</flag>
<border>5</border> <border>5</border>
<option>0</option> <option>0</option>
<object class="wxButton" name="m_button1"> <object class="wxButton" name="cancel">
<label>_Cancel</label> <label>_Cancel</label>
<default>0</default> <default>0</default>
<auth_needed>0</auth_needed> <auth_needed>0</auth_needed>
@ -173,7 +188,7 @@
<flag>wxALL</flag> <flag>wxALL</flag>
<border>5</border> <border>5</border>
<option>0</option> <option>0</option>
<object class="wxButton" name="m_button2"> <object class="wxButton" name="install">
<label>_Install</label> <label>_Install</label>
<default>0</default> <default>0</default>
<auth_needed>0</auth_needed> <auth_needed>0</auth_needed>

2
installer/ui.cpp
View file

@ -1,5 +1,5 @@
#include "ui.hpp" #include "ui.hpp"
InstallerFrame::InstallerFrame() : InstallerFrame_UI(nullptr) { InstallerFrame::InstallerFrame() : InstallerFrame_UI(nullptr) {
heading->SetFont(heading->GetFont().Scaled(2));
} }

3
installer/ui.hpp
View file

@ -1,8 +1,9 @@
#pragma once #pragma once
#include "wx/wx.h" #include "wx/wx.h"
#include "wx/frame.h"
#include "wx/xrc/xmlres.h" #include "wx/xrc/xmlres.h"
#include "resources.h" #include "resources/resources.h"
class InstallerFrame final : public InstallerFrame_UI { class InstallerFrame final : public InstallerFrame_UI {
public: public: