From: terencehill Date: Fri, 8 May 2015 22:27:52 +0000 (+0200) Subject: Remove useless title attribute (and related attributes) from the tab class, the tab... X-Git-Tag: xonotic-v0.8.1~54^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=77d45a36e18ce3de85a7d06869b3bc3e6411a6b2;p=xonotic%2Fxonotic-data.pk3dir.git Remove useless title attribute (and related attributes) from the tab class, the tab button already holds the tab title --- diff --git a/qcsrc/menu/item/tab.qc b/qcsrc/menu/item/tab.qc index 8cd72ba9c..965679e0b 100644 --- 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, title, string, string_null) - ATTRIB(Tab, titleFontSize, float, 0) // pixels // 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, titleHeight, float, 0) // pixels 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 7d234c7fe..eaaa22339 100644 --- 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.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())); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc index d49cd3765..455bb2fd2 100644 --- 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)) - 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 diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc index 4636ebbdb..86e1624a8 100644 --- 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)) - ATTRIB(XonoticServerListTab, title, string, _("Join")) 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 1ec0c76e9..fb52c5315 100644 --- 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)) - ATTRIB(XonoticMediaTab, title, string, _("Media")) 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 ab2886a28..7a6ddf219 100644 --- 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)) - ATTRIB(XonoticDemoBrowserTab, title, string, _("Demo")) 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 0b7e4231c..5a1720a30 100644 --- 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)) - ATTRIB(XonoticMusicPlayerTab, title, string, _("Music")) 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 89a76b608..751bf5d9e 100644 --- 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)) - ATTRIB(XonoticScreenshotBrowserTab, title, string, "Screenshot") 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 8c2488543..0f1062038 100644 --- 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)) - 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 diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qc b/qcsrc/menu/xonotic/dialog_settings_audio.qc index cccaa2652..2a4aa3ea5 100644 --- 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)) - 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 diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc index fcbbbbe0e..9fc101675 100644 --- 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)) - 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 diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc index 5fb563ebd..4524b5133 100644 --- 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)) - ATTRIB(XonoticGameSettingsTab, title, string, _("Game")) 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 28cf3708f..052794b08 100644 --- 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) - //METHOD(XonoticGameCrosshairSettingsTab, toString, string(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) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc index bb0587184..c934d66be 100644 --- 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) - //METHOD(XonoticGameHUDSettingsTab, toString, string(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) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc index 034608d09..276fd13cf 100644 --- 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) - //METHOD(XonoticGameWeaponsSettingsTab, toString, string(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) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qc b/qcsrc/menu/xonotic/dialog_settings_game_model.qc index 1f9a23f2e..850cb1e63 100644 --- 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) - //METHOD(XonoticGameModelSettingsTab, toString, string(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) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc index 44e741934..d1f9e550b 100644 --- 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) - //METHOD(XonoticGameCrosshairSettingsTab, toString, string(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) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc index bc7cc7d7f..237b76127 100644 --- 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) - //METHOD(XonoticGameWeaponsSettingsTab, toString, string(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) diff --git a/qcsrc/menu/xonotic/dialog_settings_input.qc b/qcsrc/menu/xonotic/dialog_settings_input.qc index b4ac61348..f7fc31f11 100644 --- 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)) - 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 diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc index 2ea9c1e9c..e60ca4969 100644 --- 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)) - ATTRIB(XonoticMiscSettingsTab, title, string, _("Misc")) 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 180efccb9..d934f9050 100644 --- 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)) - ATTRIB(XonoticUserSettingsTab, title, string, _("User")) 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 36929cbd7..d242666b9 100644 --- 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)) - 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 diff --git a/qcsrc/menu/xonotic/tab.qc b/qcsrc/menu/xonotic/tab.qc index d1a867a2f..663e8a2c7 100644 --- 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, titleHeight, float, SKINFONTSIZE_TITLE * SKINHEIGHT_TITLE) // pixels ATTRIB(XonoticTab, backgroundImage, string, string_null) ENDCLASS(XonoticTab)