mirror of
https://github.com/davidgiven/fluxengine.git
synced 2025-10-31 11:17:01 -07:00
Merge pull request #575 from davidgiven/vfs
Fix some late GUI bugs and add an icon.
This commit is contained in:
David Given
GitHub
2
Makefile
2
Makefile
@@ -41,7 +41,7 @@ AR ?= $(CCPREFIX)ar
|
||||
PKG_CONFIG ?= pkg-config
|
||||
WX_CONFIG ?= wx-config
|
||||
PROTOC ?= protoc
|
||||
CFLAGS ?= -g -O0
|
||||
CFLAGS ?= -g -O3
|
||||
CXXFLAGS += -std=c++17
|
||||
LDFLAGS ?=
|
||||
PLATFORM ?= UNIX
|
||||
|
||||
BIN
extras/icon.piko
Normal file
BIN
extras/icon.piko
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
BIN
extras/icon.png
Normal file
BIN
extras/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 953 B |
117
src/gui/icon.png.h
Normal file
117
src/gui/icon.png.h
Normal file
@@ -0,0 +1,117 @@
|
||||
#ifndef ICON_PNG_H
|
||||
#define ICON_PNG_H
|
||||
|
||||
#include <wx/mstream.h>
|
||||
#include <wx/image.h>
|
||||
#include <wx/bitmap.h>
|
||||
|
||||
static const unsigned char icon_png[] =
|
||||
{
|
||||
0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00,
|
||||
0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x40,
|
||||
0x00, 0x00, 0x00, 0x40, 0x08, 0x06, 0x00, 0x00, 0x00, 0xAA,
|
||||
0x69, 0x71, 0xDE, 0x00, 0x00, 0x03, 0x80, 0x49, 0x44, 0x41,
|
||||
0x54, 0x78, 0x9C, 0xD5, 0x9B, 0x5B, 0x9A, 0xA3, 0x20, 0x10,
|
||||
0x85, 0x0F, 0xF3, 0xCD, 0x6A, 0xDC, 0x4F, 0xBB, 0x9D, 0x90,
|
||||
0xED, 0x98, 0xFD, 0x64, 0x3B, 0xCC, 0x43, 0x02, 0x2D, 0x25,
|
||||
0x97, 0x2A, 0x28, 0xC0, 0x39, 0x2F, 0x1D, 0x6D, 0x29, 0xF8,
|
||||
0x8F, 0x65, 0x81, 0xC6, 0x00, 0x6B, 0xE5, 0x16, 0xF7, 0x8F,
|
||||
0x3F, 0x0B, 0xFB, 0x76, 0xD6, 0x5A, 0x60, 0xB1, 0x09, 0x66,
|
||||
0x51, 0xBF, 0x1E, 0x1E, 0x00, 0xF0, 0xFD, 0xBC, 0x64, 0x2C,
|
||||
0x2B, 0x3A, 0x8D, 0xE0, 0xBD, 0x56, 0x99, 0x30, 0xBB, 0xC3,
|
||||
0x24, 0xBC, 0xD7, 0x0A, 0x13, 0x66, 0xD6, 0x80, 0x22, 0xFC,
|
||||
0xE7, 0x08, 0x07, 0x4C, 0xAE, 0x09, 0xB3, 0xDC, 0xAE, 0xC2,
|
||||
0xDB, 0xC7, 0xE3, 0x77, 0xC3, 0x18, 0x60, 0xD2, 0xD8, 0x66,
|
||||
0x74, 0x22, 0x83, 0xF7, 0x9A, 0x64, 0xC2, 0xE8, 0x0E, 0xDA,
|
||||
0xE0, 0xBD, 0x26, 0x98, 0x30, 0x32, 0x78, 0x1F, 0xBC, 0xD7,
|
||||
0x60, 0x13, 0x46, 0x05, 0xD6, 0x81, 0xF7, 0x1A, 0x68, 0xC2,
|
||||
0x88, 0x59, 0xA0, 0x09, 0xDE, 0x9A, 0x67, 0x21, 0xE2, 0xB8,
|
||||
0xD9, 0x41, 0xDB, 0x80, 0x66, 0x78, 0xEB, 0x1E, 0x97, 0x7D,
|
||||
0x71, 0xE4, 0x31, 0x26, 0xFC, 0x55, 0x8C, 0xA5, 0x72, 0xE6,
|
||||
0xFD, 0x36, 0x35, 0xE4, 0xD3, 0x83, 0x03, 0x8C, 0x71, 0x50,
|
||||
0xBC, 0x1C, 0xB4, 0x02, 0xA9, 0xA6, 0x7D, 0x12, 0xFE, 0x2C,
|
||||
0xC5, 0x9A, 0xA0, 0x11, 0x64, 0x2E, 0xBC, 0x97, 0x92, 0x09,
|
||||
0xBD, 0x01, 0xD6, 0xC0, 0x7B, 0x29, 0x98, 0xD0, 0x53, 0x04,
|
||||
0xF5, 0xAB, 0xBD, 0x78, 0x04, 0xFD, 0x85, 0xB1, 0xD5, 0x3D,
|
||||
0x75, 0xF8, 0xDC, 0xD9, 0x2F, 0x16, 0x45, 0xAF, 0x8E, 0x4C,
|
||||
0x68, 0x69, 0x34, 0xF4, 0xCC, 0x5B, 0xF7, 0x08, 0xD3, 0x22,
|
||||
0x0B, 0xDE, 0xAB, 0xD1, 0x04, 0x69, 0x83, 0x25, 0x69, 0x3F,
|
||||
0xB2, 0x30, 0x4A, 0x6A, 0x40, 0xD7, 0x22, 0x27, 0x05, 0xC1,
|
||||
0x01, 0x4B, 0xB6, 0xCB, 0x19, 0xDA, 0x50, 0x13, 0xB8, 0x0B,
|
||||
0xA1, 0xE6, 0xB5, 0x7D, 0x2B, 0x78, 0xB6, 0x6D, 0x62, 0xD5,
|
||||
0x18, 0x49, 0xB8, 0x58, 0xE2, 0x64, 0x40, 0xFD, 0x49, 0x0E,
|
||||
0x00, 0xFB, 0x2C, 0xA7, 0x79, 0xEE, 0x7A, 0x2E, 0xC1, 0x84,
|
||||
0x36, 0xE4, 0x6F, 0xED, 0x78, 0x49, 0x26, 0xD4, 0x5C, 0x62,
|
||||
0xC1, 0x47, 0x83, 0xC8, 0x65, 0x42, 0xE6, 0xCC, 0xB5, 0xD6,
|
||||
0x87, 0xD4, 0xBD, 0xC3, 0x25, 0x3E, 0xA3, 0x26, 0x94, 0x32,
|
||||
0xA0, 0x0A, 0xBF, 0x6D, 0x1B, 0xB6, 0x6D, 0x8B, 0x07, 0x92,
|
||||
0xC8, 0x84, 0x52, 0xDA, 0x4A, 0x32, 0x22, 0xDB, 0x26, 0x17,
|
||||
0x9F, 0x91, 0x09, 0x39, 0x77, 0x58, 0xF0, 0x67, 0xBD, 0xDF,
|
||||
0xEF, 0x78, 0x50, 0xCC, 0xFB, 0xFD, 0x73, 0x06, 0x9C, 0x21,
|
||||
0xB8, 0xAB, 0xC5, 0x6A, 0x4D, 0x00, 0x8A, 0x99, 0x90, 0xCA,
|
||||
0x00, 0x31, 0x3C, 0x10, 0x1E, 0x69, 0xFF, 0x6E, 0x57, 0x6A,
|
||||
0x02, 0xD0, 0x0E, 0x7F, 0xAE, 0x09, 0xAC, 0x82, 0x5A, 0xC8,
|
||||
0x04, 0xEA, 0x4A, 0x13, 0xFC, 0xBE, 0xEF, 0x70, 0xCE, 0xC1,
|
||||
0x18, 0x73, 0x35, 0xA2, 0x90, 0x09, 0xC5, 0x4B, 0x83, 0x51,
|
||||
0x1B, 0xC4, 0xB3, 0x44, 0x22, 0x13, 0xCE, 0x19, 0xD0, 0x05,
|
||||
0x0F, 0x00, 0xCE, 0x39, 0x51, 0x26, 0xF4, 0xC2, 0xA7, 0x66,
|
||||
0x89, 0x6C, 0xCC, 0xE7, 0xD3, 0x8F, 0x2D, 0xCA, 0x84, 0xB3,
|
||||
0x1B, 0x45, 0x03, 0x6A, 0xF0, 0x51, 0x50, 0x61, 0x26, 0x44,
|
||||
0xC7, 0xD1, 0x07, 0x24, 0x27, 0xD0, 0x6A, 0xDB, 0x02, 0x7C,
|
||||
0xB4, 0x7D, 0xFA, 0x06, 0x8A, 0xB5, 0x12, 0x94, 0xC0, 0x03,
|
||||
0xF2, 0x4C, 0x08, 0xC7, 0x90, 0x55, 0xA3, 0xE4, 0xF6, 0x98,
|
||||
0x0B, 0x0F, 0x20, 0xCA, 0x84, 0xAA, 0x01, 0x12, 0xF8, 0xD7,
|
||||
0xEB, 0x15, 0x3E, 0xB7, 0x98, 0x10, 0x15, 0x42, 0x52, 0xF0,
|
||||
0xB8, 0xED, 0x72, 0xFD, 0x59, 0x6B, 0xA3, 0x6B, 0xDF, 0x9B,
|
||||
0x50, 0x34, 0xA0, 0x05, 0xBE, 0xD7, 0x04, 0xAA, 0x5A, 0x36,
|
||||
0x48, 0xE0, 0xCF, 0x26, 0xF8, 0xCB, 0x20, 0x3B, 0x0B, 0xB4,
|
||||
0x9E, 0x79, 0xAF, 0x9F, 0x9F, 0x9F, 0xF0, 0xB9, 0xB7, 0x26,
|
||||
0xE4, 0xEA, 0x80, 0x30, 0xED, 0x8D, 0xB5, 0xD6, 0x7D, 0x3F,
|
||||
0x03, 0xDF, 0x1A, 0x90, 0x5A, 0x1C, 0xB8, 0xE3, 0x38, 0x2E,
|
||||
0x3B, 0x25, 0xF0, 0x5E, 0xBD, 0x26, 0xD0, 0xAA, 0x9E, 0x5B,
|
||||
0x37, 0x44, 0x6D, 0x6A, 0x97, 0x19, 0xF9, 0x0A, 0x3E, 0x75,
|
||||
0x09, 0x98, 0x7D, 0xDF, 0xA3, 0x1D, 0x2D, 0xF0, 0x54, 0xE2,
|
||||
0x29, 0x72, 0x02, 0xFC, 0x65, 0x83, 0xC8, 0x1D, 0xC7, 0xD1,
|
||||
0x0C, 0x7F, 0x3E, 0xFB, 0x51, 0x87, 0x8C, 0x4C, 0x28, 0xDD,
|
||||
0x38, 0x69, 0xC2, 0x27, 0x77, 0x10, 0x39, 0x4D, 0xF8, 0xD0,
|
||||
0x69, 0xC1, 0x84, 0x99, 0xF0, 0xD9, 0x9D, 0x44, 0x91, 0x09,
|
||||
0xBD, 0xF0, 0xA1, 0x63, 0x41, 0x4D, 0x18, 0x05, 0x5F, 0xFC,
|
||||
0x07, 0x51, 0x30, 0x81, 0x5B, 0xF4, 0x38, 0xEA, 0x99, 0x1D,
|
||||
0x80, 0x7E, 0xF8, 0xEA, 0x3F, 0x89, 0x8A, 0x26, 0x48, 0xE1,
|
||||
0xC3, 0x00, 0x1A, 0x4D, 0xD0, 0x80, 0x67, 0x1D, 0x40, 0x94,
|
||||
0x34, 0xA1, 0x15, 0x3E, 0x0C, 0x42, 0x7A, 0x17, 0xA9, 0x04,
|
||||
0xCF, 0x3E, 0x88, 0x28, 0x32, 0xA1, 0x17, 0x3E, 0x0C, 0x84,
|
||||
0x69, 0x82, 0x26, 0xBC, 0xE8, 0x40, 0xA2, 0xE4, 0xEC, 0x00,
|
||||
0x7C, 0x40, 0x72, 0xFF, 0xAB, 0x0E, 0xA6, 0x62, 0x82, 0x36,
|
||||
0xBC, 0xF8, 0x60, 0xA2, 0xA9, 0x26, 0x8C, 0x80, 0x6F, 0x6A,
|
||||
0x40, 0x14, 0x4C, 0xA0, 0xD0, 0xAD, 0x26, 0x18, 0x63, 0x70,
|
||||
0x1C, 0xC7, 0xE5, 0x19, 0x63, 0x49, 0x3D, 0x6F, 0x98, 0xAA,
|
||||
0xBC, 0x1F, 0xA0, 0x65, 0x82, 0x87, 0xF7, 0xE2, 0x98, 0xD0,
|
||||
0xFB, 0x7A, 0xAD, 0xDA, 0x1B, 0x22, 0xBD, 0x26, 0x50, 0x78,
|
||||
0xAF, 0x92, 0x09, 0x1A, 0xEF, 0x16, 0x6B, 0xBE, 0x7A, 0xD6,
|
||||
0x6C, 0xC2, 0x2A, 0x78, 0x95, 0x00, 0x44, 0x62, 0x13, 0x56,
|
||||
0xC2, 0xAB, 0x05, 0x21, 0xCA, 0x9A, 0x70, 0xE9, 0x7C, 0x31,
|
||||
0xBC, 0x6A, 0x20, 0xA2, 0xAA, 0x09, 0x77, 0x80, 0x57, 0x0F,
|
||||
0x46, 0x54, 0x5C, 0x27, 0xDC, 0x01, 0x7E, 0x48, 0x40, 0xA2,
|
||||
0x8B, 0x09, 0x77, 0x82, 0x1F, 0x16, 0x94, 0x28, 0xBA, 0x1C,
|
||||
0xEE, 0x04, 0x3F, 0x34, 0x30, 0x91, 0x03, 0x70, 0x3B, 0x78,
|
||||
0x60, 0xDE, 0x6F, 0x86, 0x92, 0x10, 0xAB, 0xE1, 0xA7, 0x74,
|
||||
0x40, 0x14, 0x1E, 0xB9, 0xDF, 0x01, 0x1E, 0x98, 0xFF, 0xCB,
|
||||
0x51, 0x03, 0xDC, 0x07, 0x7E, 0x6A, 0x47, 0x44, 0xB7, 0xF9,
|
||||
0xF1, 0xE4, 0x2A, 0x03, 0x80, 0x1B, 0xFD, 0x7C, 0x76, 0xA5,
|
||||
0xDC, 0xF7, 0xFB, 0xBA, 0xAE, 0x17, 0x9E, 0xFF, 0x77, 0x2D,
|
||||
0x85, 0xFF, 0x07, 0xE6, 0x6F, 0xFC, 0xB7, 0xE2, 0xFB, 0x3A,
|
||||
0x0B, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE,
|
||||
0x42, 0x60, 0x82,
|
||||
};
|
||||
|
||||
wxBitmap& icon_png_to_wx_bitmap()
|
||||
{
|
||||
static wxMemoryInputStream memIStream( icon_png, sizeof( icon_png ) );
|
||||
static wxImage image( memIStream, wxBITMAP_TYPE_PNG );
|
||||
static wxBitmap bmp( image );
|
||||
return bmp;
|
||||
}
|
||||
|
||||
|
||||
#endif //ICON_PNG_H
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#include "layout.h"
|
||||
|
||||
#include "icon.png.h"
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
MainWindowGen::MainWindowGen( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
|
||||
@@ -55,6 +57,9 @@ MainWindowGen::MainWindowGen( wxWindow* parent, wxWindowID id, const wxString& t
|
||||
fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
|
||||
|
||||
fgSizer8->SetMinSize( wxSize( 400,-1 ) );
|
||||
applicationBitmap = new wxStaticBitmap( idlePanel, wxID_ANY, icon_png_to_wx_bitmap(), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
fgSizer8->Add( applicationBitmap, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
|
||||
|
||||
m_staticText61 = new wxStaticText( idlePanel, wxID_ANY, wxT("Pick one of:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText61->Wrap( -1 );
|
||||
fgSizer8->Add( m_staticText61, 0, wxALIGN_CENTER|wxALL, 5 );
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<property name="disconnect_mode">source_name</property>
|
||||
<property name="disconnect_php_events">0</property>
|
||||
<property name="disconnect_python_events">0</property>
|
||||
<property name="embedded_files_path">res</property>
|
||||
<property name="embedded_files_path">.</property>
|
||||
<property name="encoding">UTF-8</property>
|
||||
<property name="event_generation">connect</property>
|
||||
<property name="file">layout</property>
|
||||
@@ -290,6 +290,65 @@
|
||||
<property name="permission">none</property>
|
||||
<property name="rows">0</property>
|
||||
<property name="vgap">0</property>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticBitmap" expanded="1">
|
||||
<property name="BottomDockable">1</property>
|
||||
<property name="LeftDockable">1</property>
|
||||
<property name="RightDockable">1</property>
|
||||
<property name="TopDockable">1</property>
|
||||
<property name="aui_layer"></property>
|
||||
<property name="aui_name"></property>
|
||||
<property name="aui_position"></property>
|
||||
<property name="aui_row"></property>
|
||||
<property name="best_size"></property>
|
||||
<property name="bg"></property>
|
||||
<property name="bitmap">Load From Embedded File; ../../extras/icon.png</property>
|
||||
<property name="caption"></property>
|
||||
<property name="caption_visible">1</property>
|
||||
<property name="center_pane">0</property>
|
||||
<property name="close_button">1</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="default_pane">0</property>
|
||||
<property name="dock">Dock</property>
|
||||
<property name="dock_fixed">0</property>
|
||||
<property name="docking">Left</property>
|
||||
<property name="drag_accept_files">0</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="floatable">1</property>
|
||||
<property name="font"></property>
|
||||
<property name="gripper">0</property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="max_size"></property>
|
||||
<property name="maximize_button">0</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="min_size"></property>
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">applicationBitmap</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="pin_button">1</property>
|
||||
<property name="pos"></property>
|
||||
<property name="resize">Resizable</property>
|
||||
<property name="show">1</property>
|
||||
<property name="size"></property>
|
||||
<property name="subclass">; ; forward_declare</property>
|
||||
<property name="toolbar_pane">0</property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
</object>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="0">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxALIGN_CENTER|wxALL</property>
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <wx/font.h>
|
||||
#include <wx/colour.h>
|
||||
#include <wx/settings.h>
|
||||
#include <wx/statbmp.h>
|
||||
#include <wx/stattext.h>
|
||||
#include <wx/radiobut.h>
|
||||
#include <wx/combobox.h>
|
||||
@@ -57,6 +58,7 @@ class MainWindowGen : public wxFrame
|
||||
wxMenu* m_menu2;
|
||||
wxSimplebook* dataNotebook;
|
||||
wxScrolledWindow* idlePanel;
|
||||
wxStaticBitmap* applicationBitmap;
|
||||
wxStaticText* m_staticText61;
|
||||
wxRadioButton* realDiskRadioButton;
|
||||
wxPanel* realDiskRadioButtonPanel;
|
||||
|
||||
@@ -46,6 +46,7 @@ private:
|
||||
|
||||
bool FluxEngineApp::OnInit()
|
||||
{
|
||||
wxImage::AddHandler(new wxPNGHandler());
|
||||
Bind(EXEC_EVENT_TYPE, &FluxEngineApp::OnExec, this);
|
||||
_mainWindow = CreateMainWindow();
|
||||
_mainWindow->Show(true);
|
||||
|
||||
@@ -62,6 +62,10 @@ public:
|
||||
_dndFormat(wxDF_UNICODETEXT),
|
||||
_config("FluxEngine")
|
||||
{
|
||||
wxIcon icon;
|
||||
icon.CopyFromBitmap(applicationBitmap->GetBitmap());
|
||||
SetIcon(icon);
|
||||
|
||||
Logger::setLogger(
|
||||
[&](std::shared_ptr<const AnyLogMessage> message)
|
||||
{
|
||||
@@ -920,21 +924,25 @@ public:
|
||||
if (event.GetDataFormat() != _dndFormat)
|
||||
throw CancelException();
|
||||
|
||||
/* wxWidgets 3.0 data view DnD is borked. See
|
||||
* https://forums.wxwidgets.org/viewtopic.php?t=44752. The hit
|
||||
* detection is done against the wrong object, resulting in the
|
||||
* header size not being taken into account, so we have to manually
|
||||
* do hit detection correctly. */
|
||||
#if defined __WXGTK__
|
||||
/* wxWidgets 3.0 data view DnD on GTK is borked. See
|
||||
* https://forums.wxwidgets.org/viewtopic.php?t=44752. The hit
|
||||
* detection is done against the wrong object, resulting in the
|
||||
* header size not being taken into account, so we have to manually
|
||||
* do hit detection correctly. */
|
||||
|
||||
auto* window = browserTree->GetMainWindow();
|
||||
auto screenPos = wxGetMousePosition();
|
||||
auto relPos = screenPos - window->GetScreenPosition();
|
||||
auto* window = browserTree->GetMainWindow();
|
||||
auto screenPos = wxGetMousePosition();
|
||||
auto relPos = screenPos - window->GetScreenPosition();
|
||||
|
||||
wxDataViewItem item;
|
||||
wxDataViewColumn* column;
|
||||
browserTree->HitTest(relPos, item, column);
|
||||
if (!item.IsOk())
|
||||
throw CancelException();
|
||||
wxDataViewItem item;
|
||||
wxDataViewColumn* column;
|
||||
browserTree->HitTest(relPos, item, column);
|
||||
if (!item.IsOk())
|
||||
throw CancelException();
|
||||
#else
|
||||
auto item = event.GetItem();
|
||||
#endif
|
||||
|
||||
auto destDirNode = GetTargetDirectoryNode(item);
|
||||
if (!destDirNode)
|
||||
|
||||
Reference in New Issue
Block a user