Remove useless title attribute (and related attributes) from the tab class, the tab...

diff --git a/qcsrc/menu/item/tab.qc b/qcsrc/menu/item/tab.qc
index 8cd72ba9c76a253b73001f2b1a32e3b95d23bf89..965679e0bebee564382ee842343c78942e222e53 100644 (file)
--- a/qcsrc/menu/item/tab.qc
+++ b/qcsrc/menu/item/tab.qc
@@ -3,8 +3,6 @@ CLASS(Tab) EXTENDS(Dialog)
        ATTRIB(Tab, isTabRoot, float, 0)
        ATTRIB(Tab, closable, float, 0)
        ATTRIB(Tab, rootDialog, float, 0)
        ATTRIB(Tab, isTabRoot, float, 0)
        ATTRIB(Tab, closable, float, 0)
        ATTRIB(Tab, rootDialog, float, 0)

-       ATTRIB(Tab, title, string, string_null)
-       ATTRIB(Tab, titleFontSize, float, 0) // pixels

 
        // still to be customized
        ATTRIB(Tab, intendedWidth, float, 0)
 
        // still to be customized
        ATTRIB(Tab, intendedWidth, float, 0)


@@ -18,7 +16,6 @@ CLASS(Tab) EXTENDS(Dialog)
        ATTRIB(Tab, columnSpacing, float, 0) // pixels
        ATTRIB(Tab, rowSpacing, float, 0) // pixels
        ATTRIB(Tab, rowHeight, float, 0) // pixels
        ATTRIB(Tab, columnSpacing, float, 0) // pixels
        ATTRIB(Tab, rowSpacing, float, 0) // pixels
        ATTRIB(Tab, rowHeight, float, 0) // pixels

-       ATTRIB(Tab, titleHeight, float, 0) // pixels

 
        ATTRIB(Tab, backgroundImage, string, string_null)
 ENDCLASS(Tab)
 
        ATTRIB(Tab, backgroundImage, string, string_null)
 ENDCLASS(Tab)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer.qc b/qcsrc/menu/xonotic/dialog_multiplayer.qc
index 7d234c7fe84907a024e1de737d5b73810f0014d0..eaaa22339f4441fb51c87b3a0fde2993ad591fda 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer.qc
@@ -17,9 +17,6 @@ void XonoticMultiplayerDialog_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Servers"), makeXonoticServerListTab()));
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Create"), makeXonoticServerCreateTab()));
        me.TR(me);
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Servers"), makeXonoticServerListTab()));
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Create"), makeXonoticServerCreateTab()));

-               //me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Demos"), makeXonoticDemoBrowserTab()));
-               //me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Screenshots"), makeXonoticScreenshotBrowserTab()));
-               //me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Players"), makeXonoticDemoBrowserTab()));

                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Media"), makeXonoticMediaTab()));
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Profile"), makeXonoticProfileTab()));
 
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Media"), makeXonoticMediaTab()));
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Profile"), makeXonoticProfileTab()));
 

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
index d49cd3765ca5957a5f35ed17364ddc74fe2d63ad..455bb2fd2ebbd9f9d201061d5529bb2ec04a2fe9 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
@@ -3,7 +3,6 @@ CLASS(XonoticServerCreateTab) EXTENDS(XonoticTab)
        METHOD(XonoticServerCreateTab, fill, void(entity))
        METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity))
        METHOD(XonoticServerCreateTab, gameTypeSelectNotify, void(entity))
        METHOD(XonoticServerCreateTab, fill, void(entity))
        METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity))
        METHOD(XonoticServerCreateTab, gameTypeSelectNotify, void(entity))

-       ATTRIB(XonoticServerCreateTab, title, string, _("Create"))

        ATTRIB(XonoticServerCreateTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticServerCreateTab, rows, float, 23)
        ATTRIB(XonoticServerCreateTab, columns, float, 6.2) // added extra .2 for center space
        ATTRIB(XonoticServerCreateTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticServerCreateTab, rows, float, 23)
        ATTRIB(XonoticServerCreateTab, columns, float, 6.2) // added extra .2 for center space

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
index 4636ebbdbbfe3321e25b1a2f7a18b246e414849c..86e1624a81175472570c90feb6a6ef3147f5bd63 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticServerListTab) EXTENDS(XonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticServerListTab) EXTENDS(XonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity))

-       ATTRIB(XonoticServerListTab, title, string, _("Join"))

        ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticServerListTab, rows, float, 23)
        ATTRIB(XonoticServerListTab, columns, float, 6.5)
        ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticServerListTab, rows, float, 23)
        ATTRIB(XonoticServerListTab, columns, float, 6.5)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
index 1ec0c76e9e7b35fff87ed408a40de939a55d0b57..fb52c5315b30bce67fa8150ec428e05f07d92ead 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticMediaTab) EXTENDS(XonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticMediaTab) EXTENDS(XonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity))

-       ATTRIB(XonoticMediaTab, title, string, _("Media"))

        ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMediaTab, rows, float, 23)
        ATTRIB(XonoticMediaTab, columns, float, 3)
        ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMediaTab, rows, float, 23)
        ATTRIB(XonoticMediaTab, columns, float, 3)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
index ab2886a28542f66987de95c3ba02ea108ee38cb1..7a6ddf219cbfec75482a4224bf0254f1c8f31d2c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab)
        METHOD(XonoticDemoBrowserTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab)
        METHOD(XonoticDemoBrowserTab, fill, void(entity))

-       ATTRIB(XonoticDemoBrowserTab, title, string, _("Demo"))

        ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticDemoBrowserTab, rows, float, 21)
        ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5)
        ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticDemoBrowserTab, rows, float, 21)
        ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
index 0b7e4231ce50e4c1742e79d17fbcf714145d228f..5a1720a30ac6f05ef0173d5ae6993abb5197e287 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticMusicPlayerTab) EXTENDS(XonoticTab)
        METHOD(XonoticMusicPlayerTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticMusicPlayerTab) EXTENDS(XonoticTab)
        METHOD(XonoticMusicPlayerTab, fill, void(entity))

-       ATTRIB(XonoticMusicPlayerTab, title, string, _("Music"))

        ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMusicPlayerTab, rows, float, 21)
        ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5)
        ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMusicPlayerTab, rows, float, 21)
        ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
index 89a76b608dce46dcb73c662188a790298b15f749..751bf5d9e4ca9d589a2806995a70a8b34296facd 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticScreenshotBrowserTab) EXTENDS(XonoticTab)
        METHOD(XonoticScreenshotBrowserTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticScreenshotBrowserTab) EXTENDS(XonoticTab)
        METHOD(XonoticScreenshotBrowserTab, fill, void(entity))

-       ATTRIB(XonoticScreenshotBrowserTab, title, string, "Screenshot")

        ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1)
        ATTRIB(XonoticScreenshotBrowserTab, rows, float, 21)
        ATTRIB(XonoticScreenshotBrowserTab, columns, float, 6.5)
        ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1)
        ATTRIB(XonoticScreenshotBrowserTab, rows, float, 21)
        ATTRIB(XonoticScreenshotBrowserTab, columns, float, 6.5)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
index 8c24885439e8ec9b16ac9aff2837f032fc0289dd..0f1062038b996c800dd9d44b55e1b24d72c75f66 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
@@ -2,7 +2,6 @@
 CLASS(XonoticProfileTab) EXTENDS(XonoticTab)
        METHOD(XonoticProfileTab, fill, void(entity))
        METHOD(XonoticProfileTab, draw, void(entity))
 CLASS(XonoticProfileTab) EXTENDS(XonoticTab)
        METHOD(XonoticProfileTab, fill, void(entity))
        METHOD(XonoticProfileTab, draw, void(entity))

-       ATTRIB(XonoticProfileTab, title, string, _("Profile"))

        ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticProfileTab, rows, float, 23)
        ATTRIB(XonoticProfileTab, columns, float, 6.1) // added extra .2 for center space
        ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticProfileTab, rows, float, 23)
        ATTRIB(XonoticProfileTab, columns, float, 6.1) // added extra .2 for center space

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qc b/qcsrc/menu/xonotic/dialog_settings_audio.qc
index cccaa2652818b5bbf91dc9bfe9c204a33f85bdcf..2a4aa3ea56b9624990cd97bcf8c2b72f5aee693e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticAudioSettingsTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticAudioSettingsTab, fill, void(entity))

-       ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio"))

        ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space
        ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc
index fcbbbbe0e19b6a740576762a673d725b16e21bd4..9fc10167566529ba59236dca42adf18c3771e65f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticEffectsSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticEffectsSettingsTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticEffectsSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticEffectsSettingsTab, fill, void(entity))

-       ATTRIB(XonoticEffectsSettingsTab, title, string, _("Effects"))

        ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticEffectsSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space
        ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticEffectsSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc
index 5fb563ebd7be2243e3092c01fd6f29c431411d2f..4524b5133f97459da3144c390d701d1ee5988d2e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticGameSettingsTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticGameSettingsTab, fill, void(entity))

-       ATTRIB(XonoticGameSettingsTab, title, string, _("Game"))

        ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticGameSettingsTab, columns, float, 6.5)
        ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticGameSettingsTab, columns, float, 6.5)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
index 28cf3708f3af0833b98028ef9b42e433a934292c..052794b0899618499b8f7498ef89877e82bfb64d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
@@ -1,9 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticGameCrosshairSettingsTab) EXTENDS(XonoticTab)
 #ifdef INTERFACE
 CLASS(XonoticGameCrosshairSettingsTab) EXTENDS(XonoticTab)

-       //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity))

        METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity))
        METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity))
        METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity))
        METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity))

-       ATTRIB(XonoticGameCrosshairSettingsTab, title, string, _("Crosshair"))

        ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2)
        ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
index bb0587184be7b6ca1491c4cc2730a3eb9831091a..c934d66be324f3bf6f7a8422e5d1e67eec82fab5 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
@@ -1,9 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticGameHUDSettingsTab) EXTENDS(XonoticTab)
 #ifdef INTERFACE
 CLASS(XonoticGameHUDSettingsTab) EXTENDS(XonoticTab)

-       //METHOD(XonoticGameHUDSettingsTab, toString, string(entity))

        METHOD(XonoticGameHUDSettingsTab, fill, void(entity))
        METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity))
        METHOD(XonoticGameHUDSettingsTab, fill, void(entity))
        METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity))

-       ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD"))

        ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2)
        ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc
index 034608d096d396ca59142133ff54018ef5c9b62f..276fd13cfdc9ffec693a025e982a53da54f26318 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc
@@ -1,9 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticGameMessageSettingsTab) EXTENDS(XonoticTab)
 #ifdef INTERFACE
 CLASS(XonoticGameMessageSettingsTab) EXTENDS(XonoticTab)

-       //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity))

        METHOD(XonoticGameMessageSettingsTab, fill, void(entity))
        METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity))
        METHOD(XonoticGameMessageSettingsTab, fill, void(entity))
        METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity))

-       ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages"))

        ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameMessageSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6)
        ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameMessageSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qc b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
index 1f9a23f2e488c852b25073a943cfdf28ac6020d3..850cb1e639202de9635cec931f9c06a12e66b2ee 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc
@@ -1,9 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticGameModelSettingsTab) EXTENDS(XonoticTab)
 #ifdef INTERFACE
 CLASS(XonoticGameModelSettingsTab) EXTENDS(XonoticTab)

-       //METHOD(XonoticGameModelSettingsTab, toString, string(entity))

        METHOD(XonoticGameModelSettingsTab, fill, void(entity))
        METHOD(XonoticGameModelSettingsTab, showNotify, void(entity))
        METHOD(XonoticGameModelSettingsTab, fill, void(entity))
        METHOD(XonoticGameModelSettingsTab, showNotify, void(entity))

-       ATTRIB(XonoticGameModelSettingsTab, title, string, _("Model"))

        ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameModelSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameModelSettingsTab, columns, float, 5)
        ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameModelSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameModelSettingsTab, columns, float, 5)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc
index 44e741934ce1348892e7f22ae42dd5f1933a9e81..d1f9e550be69764a2bf29aee3d220de98c70aa7d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc
@@ -1,9 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticGameViewSettingsTab) EXTENDS(XonoticTab)
 #ifdef INTERFACE
 CLASS(XonoticGameViewSettingsTab) EXTENDS(XonoticTab)

-       //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity))

        METHOD(XonoticGameViewSettingsTab, fill, void(entity))
        METHOD(XonoticGameViewSettingsTab, showNotify, void(entity))
        METHOD(XonoticGameViewSettingsTab, fill, void(entity))
        METHOD(XonoticGameViewSettingsTab, showNotify, void(entity))

-       ATTRIB(XonoticGameViewSettingsTab, title, string, _("View"))

        ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameViewSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2)
        ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameViewSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
index bc7cc7d7ff554d2aa56893dc56e08e19f136a1b1..237b761272019522d997a3c3bc04af8a0808d60d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
@@ -1,9 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticGameWeaponsSettingsTab) EXTENDS(XonoticTab)
 #ifdef INTERFACE
 CLASS(XonoticGameWeaponsSettingsTab) EXTENDS(XonoticTab)

-       //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity))

        METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity))
        METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity))
        METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity))
        METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity))

-       ATTRIB(XonoticGameWeaponsSettingsTab, title, string, _("Weapons"))

        ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6)
        ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 13)
        ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6)

diff --git a/qcsrc/menu/xonotic/dialog_settings_input.qc b/qcsrc/menu/xonotic/dialog_settings_input.qc
index b4ac6134834ba254d571ed93db991eede16e8bfd..f7fc31f1139479ee9e30df81943a49efe9d73aa2 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_input.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_input.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticInputSettingsTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticInputSettingsTab, fill, void(entity))

-       ATTRIB(XonoticInputSettingsTab, title, string, _("Input"))

        ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticInputSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space
        ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticInputSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc
index 2ea9c1e9c263418960a277dbd04563f0fb351501..e60ca4969cfd402e23825c2f6932ee170d1b0670 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticMiscSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticMiscSettingsTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticMiscSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticMiscSettingsTab, fill, void(entity))

-       ATTRIB(XonoticMiscSettingsTab, title, string, _("Misc"))

        ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2)
        ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2)

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qc b/qcsrc/menu/xonotic/dialog_settings_user.qc
index 180efccb9bdd323ba86ef8cedc490175e46cd233..d934f9050e980ce16927d973c7f394a65471cd68 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_user.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticUserSettingsTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticUserSettingsTab, fill, void(entity))

-       ATTRIB(XonoticUserSettingsTab, title, string, _("User"))

        ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticUserSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticUserSettingsTab, columns, float, 6)
        ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticUserSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticUserSettingsTab, columns, float, 6)

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc
index 36929cbd716a669170fb8cd06903ba214e05a69b..d242666b92fd731c8c41b96709484217c17d06e9 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_video.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_video.qc
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(XonoticVideoSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticVideoSettingsTab, fill, void(entity))
 #ifdef INTERFACE
 CLASS(XonoticVideoSettingsTab) EXTENDS(XonoticTab)
        METHOD(XonoticVideoSettingsTab, fill, void(entity))

-       ATTRIB(XonoticVideoSettingsTab, title, string, _("Video"))

        ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2) // added extra .2 for center space
        ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9)
        ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5)
        ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2) // added extra .2 for center space

diff --git a/qcsrc/menu/xonotic/tab.qc b/qcsrc/menu/xonotic/tab.qc
index d1a867a2f88817253b5285838a772c444caf9994..663e8a2c72d1a614bfbfc35ede5fbda140d2fcdd 100644 (file)
--- a/qcsrc/menu/xonotic/tab.qc
+++ b/qcsrc/menu/xonotic/tab.qc
@@ -15,7 +15,6 @@ CLASS(XonoticTab) EXTENDS(Tab)
        ATTRIB(XonoticTab, columnSpacing, float, SKINMARGIN_COLUMNS) // pixels
        ATTRIB(XonoticTab, rowSpacing, float, SKINMARGIN_ROWS) // pixels
        ATTRIB(XonoticTab, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL) // pixels
        ATTRIB(XonoticTab, columnSpacing, float, SKINMARGIN_COLUMNS) // pixels
        ATTRIB(XonoticTab, rowSpacing, float, SKINMARGIN_ROWS) // pixels
        ATTRIB(XonoticTab, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL) // pixels

-       ATTRIB(XonoticTab, titleHeight, float, SKINFONTSIZE_TITLE * SKINHEIGHT_TITLE) // pixels

 
        ATTRIB(XonoticTab, backgroundImage, string, string_null)
 ENDCLASS(XonoticTab)
 
        ATTRIB(XonoticTab, backgroundImage, string, string_null)
 ENDCLASS(XonoticTab)