Merge branch 'master' into terencehill/itemstime

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / mainwindow.qc

diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc
index 11c1f226f84718b0b0a581f5d523a7845ebae242..2a4635a4089533f0819f372fee73f75095f4ce78 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.qc
+++ b/qcsrc/menu/xonotic/mainwindow.qc
@@ -62,79 +62,75 @@ void MainWindow_configureMainWindow(entity me)
 
        i = NEW(XonoticHUDNotificationDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDNotificationDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDAmmoDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDAmmoDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDHealthArmorDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDHealthArmorDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDChatDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDChatDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDModIconsDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDModIconsDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDPowerupsDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDPowerupsDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDPressedKeysDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDPressedKeysDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDRaceTimerDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDRaceTimerDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDRadarDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDRadarDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDScoreDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDScoreDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDTimerDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDTimerDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDVoteDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDVoteDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDWeaponsDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDWeaponsDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDEngineInfoDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDEngineInfoDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDInfoMessagesDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDInfoMessagesDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDPhysicsDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDPhysicsDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
-       me.screenshotViewerDialog = i = NEW(XonoticScreenshotViewerDialog);
-       i.configureDialog(i);
-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDCenterprintDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDCenterprintDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDBuffsDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDBuffsDialog);
        i.configureDialog(i);

-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       me.addItemRightCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);

 
        i = NEW(XonoticHUDItemsTimeDialog);
        i.configureDialog(i);
 
        i = NEW(XonoticHUDItemsTimeDialog);
        i.configureDialog(i);


@@ -192,6 +188,13 @@ void MainWindow_configureMainWindow(entity me)
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 

+
+       // dialogs used by multiplayer/media
+       me.screenshotViewerDialog = i = NEW(XonoticScreenshotViewerDialog);
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
+

        // mutator dialogs
        i = NEW(XonoticSandboxToolsDialog);
        i.configureDialog(i);
        // mutator dialogs
        i = NEW(XonoticSandboxToolsDialog);
        i.configureDialog(i);