Changeset 248

Timestamp:

04/12/08 18:01:39 (1 month ago)

Author:

timo

Message:

fix and improve the game selection and game configuration dialogs - added dir dialog, using GtkComboBox? (added support for GtkComboBox? too)

Files:

• GtkRadiant/branches/ZeroRadiant/install/games/q2w (deleted)
• GtkRadiant/branches/ZeroRadiant/install/games/q3ut4 (deleted)
• GtkRadiant/branches/ZeroRadiant/install/games/quake3 (deleted)
• GtkRadiant/branches/ZeroRadiant/install/games/ufoai (deleted)
• GtkRadiant/branches/ZeroRadiant/libs/str.h (modified) (3 diffs)
• GtkRadiant/branches/ZeroRadiant/radiant/dialog.cpp (modified) (3 diffs)
• GtkRadiant/branches/ZeroRadiant/radiant/dialog.h (modified) (1 diff)
• GtkRadiant/branches/ZeroRadiant/radiant/preferences.cpp (modified) (18 diffs)
• GtkRadiant/branches/ZeroRadiant/radiant/preferences.h (modified) (4 diffs)

GtkRadiant/branches/ZeroRadiant/libs/str.h

@@ -59 +59 @@
-#define __StrDup Q_StrDup
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
-const char* pStr)
-
-
-
-
-
+ const char* pStr ) {
+
+
+
+
+
-}
-
@@ -287 +288 @@
-    else
-    {
-      g_pStrWork = "";
-      g_pStrWork = new char[1];
-      g_pStrWork[0] = '\0';
@@ -328 +328 @@
-    else
-    {
-      g_pStrWork = "";
-      g_pStrWork = new char[1];
-      g_pStrWork[0] = '\0';

GtkRadiant/branches/ZeroRadiant/radiant/dialog.cpp

@@ -197 +197 @@
-            i++;
-            }
-
+
+
+
+
+
+
+
-        }
-      }
@@ -242 +248 @@
-          gtk_adjustment_set_value (GTK_ADJUSTMENT (data->object), (*(int*)data->buffer));
-          break;
-
-
+
-          GList *lst = GTK_LIST (GTK_COMBO (data->object)->list)->children;
-          char *entry = "";
@@ -255 +260 @@
-          
-          gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (data->object)->entry), entry);
-
+
+
+
+
+
+
-        }
-      }

GtkRadiant/branches/ZeroRadiant/radiant/dialog.h

@@ -37 +37 @@
-  DLG_SPIN_INT,
-  DLG_ADJ_INT,
-
+
+
-} DLG_DATA_TYPE;
-

GtkRadiant/branches/ZeroRadiant/radiant/preferences.cpp

@@ -967 +967 @@
-  strGlobalPref += "global.pref";
-  
-!mGlobalPrefs.WriteXMLFile(strGlobalPref.GetBuffer()))
+ !mGlobalPrefs.WriteXMLFile( strGlobalPref.GetBuffer() ) ) {
-    Sys_FPrintf(SYS_ERR, "Error occured while saving global prefs file '%s'\n", strGlobalPref.GetBuffer());
+  }
-}
-
-void CGameDialog::DoGameInstall() {
+        // make sure console logging is on whenever we enter the installation loop
+    g_PrefsDlg.mGamesDialog.m_bLogConsole = true;
+        Sys_LogFile();
-        mGameInstall.Run();
-}
@@ -981 +985 @@
-                m_bDoGameInstall = false;
-
-
+
+
+
+
-                
-                if ( m_bDoGameInstall ) {
@@ -1019 +1026 @@
-  gtk_box_pack_start( GTK_BOX( vbox ), text, FALSE, FALSE, 0 );
-
-new
+box_new_text
-  gtk_widget_show( combo );
-  gtk_box_pack_start( GTK_BOX( vbox ), combo, FALSE, FALSE, 0 );
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-  check = gtk_check_button_new_with_label( "Auto load selected game on startup" );
@@ -1126 +1126 @@
-        gtk_box_pack_start( GTK_BOX( vbox1 ), button, FALSE, FALSE, 0 );
-        AddModalButton( button, IDOK );
+
+        button = gtk_button_new_with_label( "Cancel" );
+        gtk_widget_show( button );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), button, FALSE, FALSE, 0 );
+        AddModalButton( button, IDCANCEL );
-        
-        gtk_widget_set_usize( button, 60, -2 );
+}
+
+void CGameDialog::UpdateGameCombo() {
+  // fill in with the game descriptions
+  list<CGameDescription *>::iterator iGame;
+
+  if ( mGameCombo == NULL ) {
+          Sys_Printf( "mGameCombo == NULL\n" );
+          return;
+  }
+
+  // clear whatever is in - wtf no way to know how many text entries?
+  // use set/get active to track 
+  gtk_combo_box_set_active( mGameCombo, 0 );
+  while ( gtk_combo_box_get_active( mGameCombo ) == 0 ) {
+          gtk_combo_box_remove_text( mGameCombo, 0 );
+          gtk_combo_box_set_active( mGameCombo, 0 );
+  }
+  
+  for ( iGame = mGames.begin(); iGame != mGames.end(); iGame++ ) {
+          gtk_combo_box_append_text( mGameCombo, (*iGame)->mGameName.GetBuffer() );
+  }
+  gtk_combo_box_set_active( mGameCombo, 0 );
-}
-
@@ -1191 +1219 @@
-      }
-
-dirlist
+ dirlist 
-    }
-
-
+
+
+
+
+
-}
-
@@ -1201 +1232 @@
-  list<CGameDescription *>::iterator iGame;
-  int i=0;
-
-
-
-
+
+
-      return (*iGame);
-    }
@@ -3139 +3168 @@
-}
-
+static void CGameInstall::OnBtnBrowseEngine( GtkWidget *widget, gpointer data ) {
+        Sys_Printf( "OnBtnBrowseEngine\n" );
+
+        CGameInstall* i = static_cast<CGameInstall*>( data );
+        char *dir = dir_dialog( widget, "Select game directory", NULL );
+
+        i->UpdateData( TRUE );
+
+        if ( dir != NULL ) {
+                i->m_strEngine = dir;
+                i->UpdateData( FALSE );
+                free( dir );
+        }
+}
+
+static void CGameInstall::OnGameSelectChanged( GtkWidget *widget, gpointer data ) {
+        Sys_Printf( "OnGameSelectChanged\n" );
+
+        CGameInstall* i = static_cast<CGameInstall*>( data );
+        i->UpdateData( TRUE );  
+        i->m_strName = gtk_combo_box_get_active_text( GTK_COMBO_BOX( widget ) );
+        i->UpdateData( FALSE );
+}
+
-void CGameInstall::BuildDialog() {
-
+, *hbox
-        
-        dlg = m_pWidget;
@@ -3153 +3206 @@
-        gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 );
-
-new
+box_new_text
-        gtk_widget_show( combo );
-        gtk_box_pack_start( GTK_BOX( vbox1 ), combo, FALSE, FALSE, 0 );
-
-
+//     
-        int iGame = 0;
-        while ( m_availGames[ iGame ] != GAME_NONE ) {
-                switch ( m_availGames[ iGame ] ) {
-                case GAME_Q2:
-combo_list = g_list_append( combo_list
+gtk_combo_box_append_text( GTK_COMBO_BOX( combo )
-                        break;
-                case GAME_Q3:
-combo_list = g_list_append( combo_list, "Quake III Arena (including mods)
+gtk_combo_box_append_text( GTK_COMBO_BOX( combo ), "Quake III Arena and mods
-                        break;
-                case GAME_URT:
-combo_list = g_list_append( combo_list
+gtk_combo_box_append_text( GTK_COMBO_BOX( combo )
-                        break;
-                case GAME_UFOAI:
-combo_list = g_list_append( combo_list
+gtk_combo_box_append_text( GTK_COMBO_BOX( combo )
-                        break;
-                case GAME_Q2W:
-combo_list = g_list_append( combo_list
+gtk_combo_box_append_text( GTK_COMBO_BOX( combo )
-                        break;
-                case GAME_WARSOW:
-combo_list = g_list_append( combo_list
+gtk_combo_box_append_text( GTK_COMBO_BOX( combo )
-                        break;
-                case GAME_NEXUIZ:
-combo_list = g_list_append( combo_list
+gtk_combo_box_append_text( GTK_COMBO_BOX( combo )
-                        break;
-                }
-                iGame++;
-        }
-gtk_combo_set_popdown_strings( GTK_COMBO( combo ), combo_list
-_list_free( combo_list
-AddDialogData( combo, &m_nComboSelect, DLG_COMBO_INT );
+AddDialogData( combo, &m_nComboSelect, DLG_COMBO_BOX_INT
+tk_signal_connect( GTK_OBJECT( combo ), "changed", G_CALLBACK( OnGameSelectChanged ), this
+gtk_combo_box_set_active( GTK_COMBO_BOX( combo ), 0 ); // NOTE: will trigger signal
-
-        text = gtk_label_new( "Name:" );
@@ -3201 +3254 @@
-        gtk_widget_show( text );
-        gtk_box_pack_start( GTK_BOX( vbox1 ), text, FALSE, FALSE, 0 );
+
+        hbox = gtk_hbox_new( FALSE, 0 );
+        gtk_widget_show( hbox );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), hbox, FALSE, FALSE, 0 );
-        
-        entry = gtk_entry_new();
-        gtk_widget_show( entry );
-vbox1
+hbox
-        AddDialogData( entry, &m_strEngine, DLG_ENTRY_TEXT );
+
+        button = gtk_button_new_with_label ("...");
+        gtk_widget_show( button );
+        gtk_signal_connect( GTK_OBJECT( button ), "clicked", GTK_SIGNAL_FUNC( OnBtnBrowseEngine ), this );
+        gtk_box_pack_start( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
-
-        // this gets done in the project stuff atm
@@ -3224 +3286 @@
-        AddModalButton( button, IDOK );
-
+        button = gtk_button_new_with_label( "Cancel" );
+        gtk_widget_show( button );
+        gtk_box_pack_start( GTK_BOX( vbox1 ), button, FALSE, FALSE, 0 );
+        AddModalButton( button, IDCANCEL );
+
-        gtk_widget_set_usize( button, 60, -2 );
-}
@@ -3229 +3296 @@
-void CGameInstall::Run() {
-        ScanGames();
-
+
+
+
+
-        Sys_Printf( "combo: %d name: %s engine: %s mod: %s\n", m_nComboSelect, m_strName.GetBuffer(), m_strEngine.GetBuffer(), m_strMod.GetBuffer() );
-
@@ -3248 +3318 @@
-        switch ( m_availGames[ m_nComboSelect ] ) {
-        case GAME_Q2: {
-games/quake2
+installs/Quake2Pack/game
-                fprintf( fg, "  prefix=\".quake2\"\n" );
-                Str source = g_strAppPath.GetBuffer();
-                source += "installs/";
-                source += Q2_PACK;
+                source += "/install/";
-                Str dest = m_strEngine.GetBuffer();
-                CopyTree( source.GetBuffer(), dest.GetBuffer() );
@@ -3259 +3330 @@
-        }
-        case GAME_Q3: {
-games/quake3
+installs/Q3Pack/game
-                fprintf( fg, "  prefix=\".q3a\"\n" );
-                Str source = g_strAppPath.GetBuffer();
-                source += "installs/";
-                source += Q3_PACK;
+                source += "/install/";
-                Str dest = m_strEngine.GetBuffer();
-                CopyTree( source.GetBuffer(), dest.GetBuffer() );
@@ -3270 +3342 @@
-        }
-        case GAME_URT: {
-games/q3ut4
+installs/UrTPack/game
-                fprintf( fg, "  prefix=\".q3a\"\n" );
-                Str source = g_strAppPath.GetBuffer();
-                source += "installs/";
-                source += URT_PACK;
+                source += "/install/";
-                Str dest = m_strEngine.GetBuffer();
-                CopyTree( source.GetBuffer(), dest.GetBuffer() );
@@ -3281 +3354 @@
-        }
-        case GAME_UFOAI: {
-games/ufoai
+installs/UFOAIPack/game
-                fprintf( fg, "  prefix=\".ufoai\"\n" );
-                Str source = g_strAppPath.GetBuffer();
-                source += "installs/";
-                source += UFOAI_PACK;
+                source += "/install/";
-                Str dest = m_strEngine.GetBuffer();
-                CopyTree( source.GetBuffer(), dest.GetBuffer() );
@@ -3292 +3366 @@
-        }
-        case GAME_Q2W: {
-games/q2w
+installs/Q2WPack/game
-                fprintf( fg, "  prefix=\".quake2world\"\n" );
-                Str source = g_strAppPath.GetBuffer();
-                source += "installs/";
-                source += Q2W_PACK;
+                source += "/install/";
-                Str dest = m_strEngine.GetBuffer();
-                CopyTree( source.GetBuffer(), dest.GetBuffer() );
@@ -3303 +3378 @@
-        }
-        case GAME_WARSOW: {
-sgames/warsow
+installs/WarsowPack/game
-                fprintf( fg, "  prefix=\".warsow\"\n" );
-                Str source = g_strAppPath.GetBuffer();
-                source += "installs/";
-                source += WARSOW_PACK;
+                source += "/install/";
-                Str dest = m_strEngine.GetBuffer();
-                CopyTree( source.GetBuffer(), dest.GetBuffer() );
@@ -3314 +3390 @@
-        }
-        case GAME_NEXUIZ: {
-games/nexuiz
+installs/NexuizPack/game
-                fprintf( fg, "  prefix=\".nexuiz\"\n" );
-                Str source = g_strAppPath.GetBuffer();
-                source += "installs/";
-                source += NEXUIZ_PACK;
+                source += "/install/";
-                Str dest = m_strEngine.GetBuffer();
-                CopyTree( source.GetBuffer(), dest.GetBuffer() );

GtkRadiant/branches/ZeroRadiant/radiant/preferences.h

@@ -214 +214 @@
-        void BuildDialog();
-
+        static void OnBtnBrowseEngine( GtkWidget *widget, gpointer data );
+        static void OnGameSelectChanged( GtkWidget *widget, gpointer data );
+
-        enum gameType_e {
-                GAME_NONE = 0,
@@ -244 +247 @@
-  GtkWidget *mTopBox; ///< top level box used to store the dialog frame, must unhook after modal use
-
+  GtkComboBox   *mGameCombo;    // combo box holds the selection of available game
-
-  /*!
@@ -311 +315 @@
-          m_bForceLogConsole = false;
-          m_bDoGameInstall = true;      // go through DoModal at least once
+          mGameCombo = NULL;
-  }
-  virtual ~CGameDialog(); 
@@ -398 +403 @@
-  */
-  static void SInstallCallback( GtkWidget *widget, gpointer data );
+
+  void UpdateGameCombo();
-};
-