Changeset 503

Timestamp:

Mar 24, 2010, 8:12:25 AM (15 years ago)

Author:

gumby

Message:

Added button to change the current directory
Fixed about window by adding a ->ShowModal (how did it get deleted?)
Fixed refresh button
Cleaned up replace_installer.bat (i think...)

Location:

AE/Installer/trunk/source

Files:

• globals.h (modified) (1 diff)
• main_window.cpp (modified) (8 diffs)
• main_window.h (modified) (3 diffs)
• replace_installer.bat (modified) (1 diff)

AE/Installer/trunk/source/globals.h

@@ -41 +41 @@
 
 #pragma mark DEFINES
-#define INSTALLER_VERSION                "1.1" // only place in source we need to set this
+#define INSTALLER_VERSION                "1.2" // only place we need to change this
 #define UPDATE_LOG_READ_ERR             -1
 #define UPDATE_INST_REPL_ERR    -2

AE/Installer/trunk/source/main_window.cpp

@@ -105 +105 @@
     EVT_MENU( wxID_ABOUT, MainWindow::OnAboutClick )
 
+        EVT_BUTTON( Dir_Button, MainWindow::OnDirButtonClick )
 ////@end MainWindow event table entries
 
@@ -115 +116 @@
 
 MainWindow::MainWindow()
-{
+{  
         Init();
 }
@@ -175 +176 @@
     CompleteRadio = NULL;
     ReglobalizeButton = NULL;
+
+        ChangeDirectoryButton = NULL;
         ////@end MainWindow member initialisation
 }
@@ -350 +353 @@
     itemBoxSizer34->Add(ReglobalizeButton, 0, wxGROW|wxALL, 5);
 
-    // Connect events and objects
+    wxStaticLine* itemStaticLine100 = new wxStaticLine( OptionsPanel, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    itemBoxSizer25->Add(itemStaticLine100, 0, wxGROW|wxALL, 5);
+
+        ChangeDirectoryButton =  new wxButton( OptionsPanel, Dir_Button, _("Change Dir"), wxDefaultPosition, wxDefaultSize, 0 );
+        ChangeDirectoryButton->SetName(_T("Dir_Button"));
+        itemBoxSizer34->Add(ChangeDirectoryButton, 0, wxGROW|wxALL, 5);
+
+        // Connect events and objects
     Mods_CheckboxList->Connect(Mods_CheckboxList1, wxEVT_CREATE, wxWindowCreateEventHandler(MainWindow::ModList_OnCreate), NULL, this);
         ////@end MainWindow content construction
@@ -617 +627 @@
         // TODO: Make About window work again!
     About* window = new About(this);
+        window->ShowModal();
     window->Destroy();
         ////@end wxEVT_COMMAND_MENU_SELECTED event handler for wxID_ABOUT in MainWindow. 
@@ -624 +635 @@
 * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for NoSep_RadioButton
 */
-
+ 
 void MainWindow::OnNoSepRadioButtonSelected( wxCommandEvent& event )
 {
@@ -658 +669 @@
 void MainWindow::OnRefreshButtonClick( wxCommandEvent& event )
 {
+        globalPackages = getPackages();
         refreshMods(globalInstalledMods);
 }
@@ -778 +790 @@
         splitInstances = true;
 }
+
+void MainWindow::OnDirButtonClick( wxCommandEvent& event )
+{
+        wxDirDialog* newDir = new wxDirDialog(this, "Set current directory", "", wxDD_DEFAULT_STYLE,
+                wxDefaultPosition, wxDefaultSize, "wxDirCtrl");
+        newDir->ShowModal();
+        if(newDir->GetPath()[0]) current_path( (path)newDir->GetPath() );
+        OnRefreshButtonClick(event);
+}

AE/Installer/trunk/source/main_window.h

@@ -66 +66 @@
 #define wxID_LOAD 10006
 #define wxID_OPTIONS 10017
+#define Dir_Button 10100
 #define SYMBOL_MAINWINDOW_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxCLOSE_BOX|wxSIMPLE_BORDER
 #define SYMBOL_MAINWINDOW_TITLE _("Installer")
@@ -154 +155 @@
     void OnAboutClick( wxCommandEvent& event );
 
+        /// change currently directory
+        void OnDirButtonClick( wxCommandEvent& event );
 ////@end MainWindow event handler declarations
 
@@ -185 +188 @@
     wxRadioButton* CompleteRadio;
     wxButton* ReglobalizeButton;
+        wxButton* ChangeDirectoryButton;
 ////@end MainWindow member variables
 

AE/Installer/trunk/source/replace_installer.bat

@@ -7 +7 @@
 
         COPY AEInstaller.exe  .\..\..\..\install\
-        START ..\..\..\install\AEInstaller.exe
+        cd ..\..\..\install\
+        START AEInstaller.exe
 )