0.8.3604

- changes in cncnet lobby gui

Author: mbnq

Resources/GameLobbyBase.ini

@@ -20,8 +20,8 @@
 ; mbnq00@gmail.com
 ; https://www.mbnq.pl/
 ;
-; .ini 	Version: 0.8.3501
-;  mod	Version: 0.8.3501
+; .ini 	Version: 0.8.3604
+;  mod	Version: 0.8.3604
 ;_____________________________________________________________________________________
 
 [INISystem]
@@ -42,14 +42,17 @@ TeamWidth=32	                ; def=46
 ; controls
 $CC00=btnLaunchGame:GameLaunchButton
 $CC01=btnLeaveGame:XNAClientButton
-$CC03=MapPreviewBox:MapPreviewBox
-$CC04=GameOptionsPanel:XNAPanel
-$CC05=PlayerOptionsPanel:XNAPanel
+$CC02=lbMapList:XNAMultiColumnListBox
+
+$CC03=GameOptionsPanel:XNAPanel
+$CC04=PlayerOptionsPanel:XNAPanel
+$CC05=MapPreviewBox:MapPreviewBox
+
+
 ;$CC06=lblMapName:XNALabel
 ;$CC07=lblMapAuthor:XNALabel
 ;$CC08=lblGameMode:XNALabel
 ;$CC09=lblMapSize:XNALabel
-$CC12=lbMapList:XNAMultiColumnListBox
 $CC13=ddGameMode:XNAClientDropDown
 $CC14=lblGameModeSelect:XNALabel
 $CC15=btnPickRandomMap:XNAClientButton
@@ -144,8 +147,29 @@ $BaseSection=ddPlayerStartBase
 [lbMapList]
 $X=LOBBY_EMPTY_SPACE_SIDES
 $Y=EMPTY_SPACE_TOP + 33
-$Width=getWidth($ParentControl) - (getX($Self) + (getWidth(MapPreviewBox) + LOBBY_EMPTY_SPACE_SIDES + LOBBY_PANEL_SPACING)
-$Height=getBottom(MapPreviewBox) - getY($Self)
+$Width=380
+$Height=getBottom($ParentControl) - getY($Self) - EMPTY_SPACE_TOP - EMPTY_SPACE_BOTTOM - 80
+SolidColorBackgroundTexture=0,0,0,128
+
+[PlayerOptionsPanel]
+$X=getWidth(lbMapList) + LOBBY_EMPTY_SPACE_SIDES + LOBBY_EMPTY_SPACE_SIDES - 3
+$Y=EMPTY_SPACE_TOP
+$Width=getWidth($ParentControl) - (getX($Self) + (getWidth(GameOptionsPanel) + DEFAULT_CONTROL_HEIGHT)
+$Height=270
+SolidColorBackgroundTexture=0,0,0,128
+$CC00=btnPlayerExtraOptionsOpen:XNAClientButton
+
+[PlayerExtraOptionsPanel]
+$Width=238
+$Height=247
+$X=getRight(PlayerOptionsPanel)
+$Y=getY(PlayerOptionsPanel)
+
+[MapPreviewBox]
+$Width=getWidth(PlayerOptionsPanel)
+$Height=getBottom(GameOptionsPanel) - getBottom(PlayerOptionsPanel) - LOBBY_PANEL_SPACING
+$X=getX(PlayerOptionsPanel)
+$Y=getBottom(PlayerOptionsPanel) + LOBBY_PANEL_SPACING 
 SolidColorBackgroundTexture=0,0,0,128
 
 [ddGameMode]
@@ -181,33 +205,24 @@ $Y=getY(btnLaunchGame) - getHeight($Self) - LOBBY_PANEL_SPACING
 [tbMapSearch]
 Suggestion=Search map...
 $Width=getRight(lbMapList) - getRight(btnPickRandomMap) - LOBBY_PANEL_SPACING
-$Height=DEFAULT_BUTTON_HEIGHT ;DEFAULT_CONTROL_HEIGHT
+$Height=DEFAULT_BUTTON_HEIGHT
 $X=getRight(btnPickRandomMap) + LOBBY_PANEL_SPACING
-$Y=getY(btnPickRandomMap) ; + 1
+$Y=getY(btnPickRandomMap)
 BackColor=255,255,255
 ;SolidColorBackgroundTexture=0,0,0,128
 ;Visible=false
 ;Enabled=false
 
-[MapPreviewBox]
-$Width=812
-$Height=380
-$X=getWidth($ParentControl) - getWidth($Self) - LOBBY_EMPTY_SPACE_SIDES
-$Y=292
-SolidColorBackgroundTexture=0,0,0,128
-
 [lblBFTIP0]
-Text=TIP: Yuri is meant to be main AI opponent in Brute Force.
-; Location=450,300
+Text=TIP: Yuri is meant to be main AI opponent in BF.
 FontIndex=3
-$X=getWidth(MapPreviewBox)
+$X=getX(GameOptionsPanel)
 $Y=getBottom(MapPreviewBox) + LABEL_SPACING
 
 [lblBFTIP1]
 Text=Yuri is not a playable side.
-; Location=450,300
 FontIndex=3
-$X=getWidth(MapPreviewBox) + 33
+$X=getX(GameOptionsPanel)
 $Y=getBottom(lblBFTIP0) + 2
 
 [lblGameMode]
@@ -220,7 +235,6 @@ FontIndex=3
 $Height=DEFAULT_LBL_HEIGHT
 $X=getX(MapPreviewBox)
 $Y=getBottom(lblGameMode) + LABEL_SPACING
-;$Y=getY(MapPreviewBox) + LABEL_SPACING
 
 [lblMapAuthor]
 FontIndex=3
@@ -243,20 +257,6 @@ $Height=DEFAULT_BUTTON_HEIGHT
 $X=getWidth($ParentControl) - getWidth($Self) - LOBBY_EMPTY_SPACE_SIDES
 $Y=getY(btnLaunchGame)
 
-[PlayerOptionsPanel]
-$X=getX(MapPreviewBox)
-$Y=EMPTY_SPACE_TOP
-$Width=getWidth($ParentControl) - (getX($Self) + (getWidth(GameOptionsPanel) + LOBBY_EMPTY_SPACE_SIDES + LOBBY_PANEL_SPACING)
-$Height=getHeight(GameOptionsPanel)
-SolidColorBackgroundTexture=0,0,0,128
-$CC00=btnPlayerExtraOptionsOpen:XNAClientButton
-
-[PlayerExtraOptionsPanel]
-$Width=238
-$Height=247
-$X=getRight(PlayerOptionsPanel) ;+ getWidth($Self)
-$Y=getY(PlayerOptionsPanel)
-
 [PlayerExtraOptionsPanel_btnClose]
 Location=220,0
 Size=18,18
@@ -302,7 +302,7 @@ HoverTexture=optionsButton_c.png
 
 [GameOptionsPanel]
 $Width=330
-$Height=270
+$Height=getBottom($ParentControl) - getY($Self) - 116
 $X=getWidth($ParentControl) - getWidth($Self) - LOBBY_EMPTY_SPACE_SIDES
 $Y=EMPTY_SPACE_TOP
 SolidColorBackgroundTexture=0,0,0,128
@@ -345,7 +345,6 @@ $CC01=BtnSaveLoadGameOptions:XNAClientButton
 $CCBF10=lblXPMult:XNALabel
 $CCBF11=lblDebugBF:XNALabel
 
-
 [BtnSaveLoadGameOptions]
 $Width=OPEN_BUTTON_WIDTH
 $Height=OPEN_BUTTON_HEIGHT
@@ -399,8 +398,6 @@ Checked=False
 Location=1038,86
 ToolTip=Allow bridges to be destroyed by conventional weapons & force firing.
 Reversed=yes
-; $X=getX(chkIngameAllying)
-; $Y=getBottom(chkNavalCombat) + GAME_OPTION_ROW_SPACING
 $X=getX(chkShortGame)
 $Y=getBottom(chkSuperWeapons) + GAME_OPTION_ROW_SPACING
 
@@ -639,7 +636,6 @@ $Y=getY(cmbDebugBF) - LABEL_SPACING - DEFAULT_LBL_HEIGHT
 Enabled=yes
 Visible=yes
 
-
 ; Window Border Sides
 
 [panelBorderTop]

Resources/MultiplayerGameLobby.ini

@@ -20,8 +20,8 @@
 ; mbnq00@gmail.com
 ; https://www.mbnq.pl/
 ;
-; .ini 	Version: 0.8.3408
-;  mod	Version: 0.8.3408
+; .ini 	Version: 0.8.3604
+;  mod	Version: 0.8.3604
 ;_____________________________________________________________________________________
 
 [INISystem]
@@ -48,10 +48,10 @@ $CCMP01=chkAutoReady:XNAClientCheckBox
 ;$CCMP06=chkAutoSave:GameLobbyCheckBox		; for future usage
 
 [lbMapList]
-$Height=291
+$Height=getBottom($ParentControl) - getY($Self) - EMPTY_SPACE_TOP - EMPTY_SPACE_BOTTOM - 400
 
 [btnPickRandomMap]
-$Y=getBottom(lbMapList) + LOBBY_PANEL_SPACING
+$Y=getBottom(lbMapList) + LOBBY_PANEL_SPACING + LOBBY_PANEL_SPACING
 
 [tbMapSearch]
 $X=getRight(btnPickRandomMap) + LOBBY_PANEL_SPACING