X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=343e0e636a03852e455237af5ec76fa62f3d79ec;hb=4626ea070c35a9c59ae231280f96e215dfc9205f;hp=93835c624f634ae0f8e15f4c7ae723846bc8410f;hpb=5c03d1c73cddd2898e81b5ea716d19f232005c62;p=xboard.git diff --git a/xboard.c b/xboard.c index 93835c6..343e0e6 100644 --- a/xboard.c +++ b/xboard.c @@ -359,7 +359,7 @@ Widget layoutWidget, formWidget, boardWidget, messageWidget, menuBarWidget, editShell, errorShell, analysisShell, ICSInputShell, fileNameShell, askQuestionShell; -Widget historyShell, evalGraphShell, gameListShell; +Widget evalGraphShell, gameListShell; //XSegment gridSegments[BOARD_RANKS + BOARD_FILES + 2]; //XSegment jailGridSegments[BOARD_RANKS + BOARD_FILES + 6]; @@ -1187,6 +1187,7 @@ ParseCommPortSettings(char *s) extern Widget engineOutputShell; extern Widget tagsShell, editTagsShell; + void GetActualPlacement(Widget wg, WindowPlacement *wp) { @@ -1216,7 +1217,7 @@ GetWindowCoords() // GetActualPlacement(shellWidget, &wpMain); if(EngineOutputIsUp()) GetActualPlacement(engineOutputShell, &wpEngineOutput); else - if(MoveHistoryIsUp()) GetActualPlacement(historyShell, &wpMoveHistory); +// if(MoveHistoryIsUp()) GetActualPlacement(historyShell, &wpMoveHistory); if(EvalGraphIsUp()) GetActualPlacement(evalGraphShell, &wpEvalGraph); if(GameListIsUp()) GetActualPlacement(gameListShell, &wpGameList); if(commentShell) GetActualPlacement(commentShell, &wpComment); @@ -1444,39 +1445,57 @@ main(argc, argv) /* test if everything worked ok */ GUI_Window = GTK_WIDGET (gtk_builder_get_object (builder, "MainWindow")); - if(!GUI_Window) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_Window) printf("Error: gtk_builder didn't work (MainWindow)!\n"); GUI_Aspect = GTK_WIDGET (gtk_builder_get_object (builder, "Aspectframe")); - if(!GUI_Aspect) printf("Error: gtk_builder didn't work!\n"); - - GUI_History = GTK_WIDGET (gtk_builder_get_object (builder, "MoveHistory")); - if(!GUI_History) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_Aspect) printf("Error: gtk_builder didn't work (Aspectframe)!\n"); GUI_Menubar = GTK_WIDGET (gtk_builder_get_object (builder, "MenuBar")); - if(!GUI_Menubar) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_Menubar) printf("Error: gtk_builder didn't work (MenuBar)!\n"); GUI_Timer = GTK_WIDGET (gtk_builder_get_object (builder, "Timer")); - if(!GUI_Timer) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_Timer) printf("Error: gtk_builder didn't work (Timer)!\n"); GUI_Buttonbar = GTK_WIDGET (gtk_builder_get_object (builder, "ButtonBar")); - if(!GUI_Buttonbar) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_Buttonbar) printf("Error: gtk_builder didn't work (ButtonBar)!\n"); GUI_Board = GTK_WIDGET (gtk_builder_get_object (builder, "Board")); - if(!GUI_Board) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_Board) printf("Error: gtk_builder didn't work (Board)!\n"); GUI_Whiteclock = GTK_WIDGET (gtk_builder_get_object (builder, "WhiteClock")); - if(!GUI_Whiteclock) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_Whiteclock) printf("Error: gtk_builder didn't work (WhiteClock)!\n"); GUI_Blackclock = GTK_WIDGET (gtk_builder_get_object (builder, "BlackClock")); - if(!GUI_Blackclock) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_Blackclock) printf("Error: gtk_builder didn't work (BlackClock)!\n"); + /* GTK lists stores*/ LIST_MoveHistory = GTK_LIST_STORE (gtk_builder_get_object (builder, "MoveHistoryStore")); - if(!LIST_MoveHistory) printf("Error: gtk_builder didn't work!\n"); + if(!LIST_MoveHistory) printf("Error: gtk_builder didn't work (MoveHistoryStore)!\n"); + + LIST_GameList = GTK_LIST_STORE (gtk_builder_get_object (builder, "GameListStore")); + if(!LIST_GameList) printf("Error: gtk_builder didn't work (GameListStore)!\n"); /* EditTags window */ GUI_EditTags = GTK_WIDGET (gtk_builder_get_object (builder, "EditTags")); - if(!GUI_EditTags) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_EditTags) printf("Error: gtk_builder didn't work (EditTags)!\n"); GUI_EditTagsTextArea = GTK_WIDGET (gtk_builder_get_object (builder, "EditTagsTextArea")); - if(!GUI_EditTagsTextArea) printf("Error: gtk_builder didn't work!\n"); + if(!GUI_EditTagsTextArea) printf("Error: gtk_builder didn't work(EditTagsTextArea)!\n"); + + /* move history and game list windows */ + GUI_History = GTK_WIDGET (gtk_builder_get_object (builder, "MoveHistory")); + if(!GUI_History) printf("Error: gtk_builder didn't work (MoveHistory)!\n"); + TREE_History = GTK_TREE_VIEW (gtk_builder_get_object (builder, "MoveHistoryView")); + if(!TREE_History) printf("Error: gtk_builder didn't work (MoveHistoryView)!\n"); + + GUI_GameList = GTK_WIDGET (gtk_builder_get_object (builder, "GameList")); + if(!GUI_GameList) printf("Error: gtk_builder didn't work (GameList)!\n"); + + TREE_Game = GTK_TREE_VIEW (gtk_builder_get_object (builder, "GameListView")); + if(!TREE_Game) printf("Error: gtk_builder didn't work (GameListView)!\n"); + + + /* connect lists to views */ + gtk_tree_view_set_model(TREE_History, GTK_TREE_MODEL(LIST_MoveHistory)); + gtk_tree_view_set_model(TREE_Game, GTK_TREE_MODEL(LIST_GameList)); gtk_builder_connect_signals (builder, NULL); @@ -3863,9 +3882,10 @@ void ModeHighlight() } } - wname = ModeToWidgetName(oldmode); - if(wname) - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, wname)),True); + // probably not needed anymore +// wname = ModeToWidgetName(oldmode); +// if(wname) +// gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, wname)),True); oldmode = gameMode; @@ -3897,8 +3917,11 @@ int LoadGamePopUp(f, gameNumber, title) else if (!ListEmpty(&gameList) && ((ListGame *) gameList.tailPred)->number > 1) { - // TODO convert to GTK - // GameListPopUp(f, title); + /* we need an answer which game to load, so let's make it modal for a while*/ + gtk_window_set_modal(GTK_WINDOW(GUI_GameList) , TRUE); + GameListPopUp(f, title); + gtk_window_set_modal(GTK_WINDOW(GUI_GameList) , FALSE); + return TRUE; };