Changeset 353

Timestamp:

Jun 15, 2009, 1:28:58 AM (15 years ago)

Author:

iritscen

Message:

Mac fixes -- status bar and sleep code.

Location:

AE/Installer/trunk/source

Files:

• main.cpp (modified) (6 diffs)
• main_window.cpp (modified) (8 diffs)

AE/Installer/trunk/source/main.cpp

@@ -1 +1 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        main.cpp
+// Name:        aeinstallerapp.cpp
 // Purpose:     
 // Author:      
@@ -25 +25 @@
 
 #include "main.h"
+#include <string>
 
 ////@begin XPM images
@@ -74 +75 @@
 void AEInstallerApp::Init()
 {
-////@begin AEInstallerApp member initialisation
-////@end AEInstallerApp member initialisation
+        ////@begin AEInstallerApp member initialisation
+        ////@end AEInstallerApp member initialisation
 }
 
@@ -81 +82 @@
  * Initialisation for AEInstallerApp
  */
-
+MainWindow* TheWindow;
 bool AEInstallerApp::OnInit()
 {    
-////@begin AEInstallerApp initialisation
+        ////@begin AEInstallerApp initialisation
         // Remove the comment markers above and below this block
         // to make permanent changes to the code.
-
+        
 #if wxUSE_XPM
         wxImage::AddHandler(new wxXPMHandler);
@@ -102 +103 @@
         MainWindow* mainWindow = new MainWindow( NULL );
         mainWindow->Show(true);
-////@end AEInstallerApp initialisation
+        ////@end AEInstallerApp initialisation
+        TheWindow = mainWindow;
+        
+        return true;
+}
 
-    return true;
+
+void setStatusArea( string s ) {
+        wxString wxs(s.c_str(), wxConvUTF8);
+        
+        TheWindow->StatusArea->SetStatusText(  wxs );
+        //TheWindow->StatusArea->SetStatusText(s.c_str());
+        //StatusArea->SetStatusText(_(s.c_str()));
+        //(*TheStatusBar)->SetStatusText(_(s.c_str()));
+        //AEInstallerApp::
+        //      TheWindow->StatusArea->SetStatusText("hi");
+        //mainWindow
+        //itemFrame1->StatusArea->SetStatusText(_"lol");
+        //MainWindow.StatusArea->SetStatusText("hi");
+        // class AbstractStatusNotifier { public: virtual void NotifyStatus(const wxString &statusString) = 0; };
+        //class StatusBarStatusNotifier : public AbstractStatusNotifier { wxStatusBar *statusbar; StatusBarStatusNotifier(wxStatusBar *bar) : statusbar(bar) { } ;
+        //void NotifyStatus(const wxString &status) { statusbar->SetStatus(status); } }
+        
+        
+        //MainWindow::StatusArea->
+        //MainWindow::MainWindow().SetSize(MainWindow::MainWindow().GetRect().GetWidth(), MainWindow::MainWindow().GetRect().GetHeight()+1);
+        
+        //MainWindow::StatusBar->SetLabel("Importing Files...");
+        //StatusBar->SetLabel(s);
+        //->SetLabel(s);
+        
 }
 
@@ -114 +143 @@
 int AEInstallerApp::OnExit()
 {    
-////@begin AEInstallerApp cleanup
+        ////@begin AEInstallerApp cleanup
         return wxApp::OnExit();
-////@end AEInstallerApp cleanup
+        ////@end AEInstallerApp cleanup
 }
 

AE/Installer/trunk/source/main_window.cpp

@@ -1 +1 @@
 /*
  AE/Mod Installer
- v1.0
  by Gumby and Iritscen
  */
+
+// To-do: - Disable Install button when nothing (new) is selected
+//                - Institute lots of checks into file-handling
+//                - Clear mod info fields when mod is de-selected
 
 #define DEBUG
@@ -43 +46 @@
 const char* strClsCmd = "clear";
 const char* strPauseCmd = "read -n 1 -p \"Press any key to continue\"";
+void Sleep(int ms) { sleep( ms / 1000 ); }
 #endif
 
@@ -779 +783 @@
         setProgressBar(1000);
         setStatusArea("Done!");
-        sleep(1000);
+        Sleep(1000);
         setProgressBar(0);
-        
 }
 
@@ -1033 +1036 @@
  * Control creation for MainWindow
  */
-wxStatusBar* TheStatusBar;
+wxStatusBar **TheStatusBar;
 wxButton* TheInstallButton;
 wxGauge* TheProgressBar;
@@ -1219 +1222 @@
                         if( binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
         }
-                TheStatusBar = StatusArea;
+                TheStatusBar = &StatusArea;
                 TheInstallButton = InstallButton;
                 TheProgressBar = ProgressBar;
@@ -1343 +1346 @@
         descriptionText->SetValue(globalPackages[event.GetSelection()].readme.c_str());
 
-        creatorText->Refresh();
+        //creatorText->Refresh();
 }
 
@@ -1425 +1428 @@
         //      boost::thread thrd2(recompileAll(localPackages) );
                 //MainWindow::MainWindow().Show();
-    recompile packages(localPackages);
-    boost::thread thrd(packages);
-
-        }
-        
-        
-}
-
-void setStatusArea( string s ) {
-        TheStatusBar->SetStatusText(_(s.c_str()));
+#ifdef WIN32
+                recompile packages(localPackages);
+                boost::thread thrd(packages);
+#else
+                this->Disable();
+                recompileAll(localPackages);
+                this->Enable();
+#endif
+
+        }
+        
+        
+}
+
+/*void setStatusArea( string s ) {
+        //TheStatusBar = MainWindow::StatusArea;
+        (**TheStatusBar).SetStatusText(_(s.c_str()), 0);
         
                 //MainWindow::MainWindow().SetSize(MainWindow::MainWindow().GetRect().GetWidth(), MainWindow::MainWindow().GetRect().GetHeight()+1);
@@ -1442 +1452 @@
 //->SetLabel(s);
         
-}
+}*/
 
 void setProgressBar( int i ) {