fixed some selector and types

fszontagh · Dec 4, 2024 · 610d49d · 610d49d
1 parent b0ca68f
commit 610d49d
Show file tree

Hide file tree

Showing 8 changed files with 185 additions and 199 deletions.
diff --git a/graphics/window_3.2_tmp.fbp b/graphics/window_3.2_tmp.fbp
@@ -17616,23 +17616,23 @@
     <object class="Frame" expanded="true">
       <property name="aui_managed">0</property>
       <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-      <property name="bg"></property>
+      <property name="bg">32,32,32</property>
       <property name="center">wxBOTH</property>
       <property name="context_help"></property>
       <property name="context_menu">0</property>
       <property name="drag_accept_files">0</property>
       <property name="enabled">1</property>
       <property name="event_handler">impl_virtual</property>
       <property name="extra_style"></property>
-      <property name="fg"></property>
+      <property name="fg">224,224,224</property>
       <property name="font"></property>
       <property name="hidden">0</property>
       <property name="id">wxID_ANY</property>
       <property name="maximum_size"></property>
       <property name="minimum_size"></property>
       <property name="name">DesktopWidget</property>
       <property name="pos"></property>
-      <property name="size">400,-1</property>
+      <property name="size">400,68</property>
       <property name="style">wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP</property>
       <property name="subclass">; ; forward_declare</property>
       <property name="title"></property>
@@ -17663,7 +17663,7 @@
             <object class="sizeritem" expanded="false">
               <property name="border">5</property>
               <property name="flag">wxALL|wxEXPAND</property>
-              <property name="proportion">1</property>
+              <property name="proportion">0</property>
               <object class="wxStaticText" expanded="false">
                 <property name="BottomDockable">1</property>
                 <property name="LeftDockable">1</property>
@@ -17711,7 +17711,7 @@
                 <property name="pos"></property>
                 <property name="resize">Resizable</property>
                 <property name="show">1</property>
-                <property name="size">-1,-1</property>
+                <property name="size">-1,24</property>
                 <property name="style"></property>
                 <property name="subclass">; ; forward_declare</property>
                 <property name="toolbar_pane">0</property>
@@ -17760,7 +17760,7 @@
                 <property name="maximum_size"></property>
                 <property name="min_size"></property>
                 <property name="minimize_button">0</property>
-                <property name="minimum_size"></property>
+                <property name="minimum_size">-1,16</property>
                 <property name="moveable">1</property>
                 <property name="name">m_currentProgress</property>
                 <property name="pane_border">1</property>

diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp
@@ -1259,7 +1259,7 @@ mainUI::mainUI( wxWindow* parent, wxWindowID id, const wxString& title, const wx
 	wxBoxSizer* bSizer117;
 	bSizer117 = new wxBoxSizer( wxVERTICAL );
 
-	m_imageinfo_preview = new wxStaticBitmap( m_scrolledWindow5, wxID_ANY, sd_cpp_gui_blankimage_png_to_wx_bitmap(), wxDefaultPosition, wxDefaultSize, wxBORDER_DEFAULT|wxBORDER_STATIC );
+	m_imageinfo_preview = new wxStaticBitmap( m_scrolledWindow5, wxID_ANY, sd_cpp_gui_blankimage_png_to_wx_bitmap(), wxDefaultPosition, wxDefaultSize, 0 );
 	m_imageinfo_preview->DragAcceptFiles( true );
 	m_imageinfo_preview->SetMinSize( wxSize( 384,384 ) );
 	m_imageinfo_preview->SetMaxSize( wxSize( 1024,1024 ) );
@@ -2440,22 +2440,25 @@ DesktopWidget::DesktopWidget( wxWindow* parent, wxWindowID id, const wxString& t
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	this->SetExtraStyle( wxWS_EX_TRANSIENT );
+	this->SetForegroundColour( wxColour( 224, 224, 224 ) );
+	this->SetBackgroundColour( wxColour( 32, 32, 32 ) );
 
 	wxBoxSizer* bSizer122;
 	bSizer122 = new wxBoxSizer( wxHORIZONTAL );
 
 	wxBoxSizer* bSizer128;
 	bSizer128 = new wxBoxSizer( wxVERTICAL );
 
-	m_currentStatus = new wxStaticText( this, wxID_ANY, _("Current job: none"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_currentStatus = new wxStaticText( this, wxID_ANY, _("Current job: none"), wxDefaultPosition, wxSize( -1,24 ), 0 );
 	m_currentStatus->Wrap( -1 );
 	m_currentStatus->SetExtraStyle( wxWS_EX_BLOCK_EVENTS );
 
-	bSizer128->Add( m_currentStatus, 1, wxALL|wxEXPAND, 5 );
+	bSizer128->Add( m_currentStatus, 0, wxALL|wxEXPAND, 5 );
 
 	m_currentProgress = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL );
 	m_currentProgress->SetValue( 0 );
 	m_currentProgress->SetExtraStyle( wxWS_EX_BLOCK_EVENTS );
+	m_currentProgress->SetMinSize( wxSize( -1,16 ) );
 
 	bSizer128->Add( m_currentProgress, 0, wxALL|wxEXPAND, 5 );
 

diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
@@ -569,7 +569,7 @@ class DesktopWidget : public wxFrame
 
 	public:
 
-		DesktopWidget( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,-1 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxBORDER_NONE, const wxString& name = wxT("DesktopWidget") );
+		DesktopWidget( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,68 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxBORDER_NONE, const wxString& name = wxT("DesktopWidget") );
 
 		~DesktopWidget();
 

diff --git a/src/ui/MainWindowDesktopWidget.cpp b/src/ui/MainWindowDesktopWidget.cpp
@@ -47,7 +47,7 @@ void MainWindowDesktopWidget::OnThreadMessage(wxThreadEvent& e) {
                 stepsDone = item->step > stepsSum ? stepsSum : item->step;
             }
 
-            steps = wxString::Format("%d/%d", stepsDone, stepsSum);
+            steps = wxString::Format("%zu/%zu", stepsDone, stepsSum);
 
             this->m_currentProgress->SetRange(stepsSum);
             this->m_currentProgress->SetValue(stepsDone);
-Original file line number
+Diff line change
@@ Expand Up / @@ -569,7 +569,7 @@ class DesktopWidget : public wxFrame @@
     	public:
-    		DesktopWidget( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,-1 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxBORDER_NONE, const wxString& name = wxT("DesktopWidget") );
+    		DesktopWidget( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,68 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxBORDER_NONE, const wxString& name = wxT("DesktopWidget") );
     		~DesktopWidget();
@@ Expand Down @@