From: otta8634 Date: Tue, 7 Jan 2025 17:18:28 +0000 (+0800) Subject: Rename dialog_multiplayer_media_guide.* to dialog_singleplayer_guide.* X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2df782a077784963c6a8cc5871f8137b4085fe3d;p=xonotic%2Fxonotic-data.pk3dir.git Rename dialog_multiplayer_media_guide.* to dialog_singleplayer_guide.* --- diff --git a/qcsrc/menu/xonotic/_mod.inc b/qcsrc/menu/xonotic/_mod.inc index 7249d3de4d..9ed1c3db2a 100644 --- a/qcsrc/menu/xonotic/_mod.inc +++ b/qcsrc/menu/xonotic/_mod.inc @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -84,6 +83,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/menu/xonotic/_mod.qh b/qcsrc/menu/xonotic/_mod.qh index b8d1e5ca56..40a4632283 100644 --- a/qcsrc/menu/xonotic/_mod.qh +++ b/qcsrc/menu/xonotic/_mod.qh @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -84,6 +83,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qc deleted file mode 100644 index ebf24543fe..0000000000 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qc +++ /dev/null @@ -1,75 +0,0 @@ -#include "dialog_multiplayer_media_guide.qh" - -#include "inputbox.qh" -#include "textlabel.qh" -#include - -void XonoticGuideDialog_fill(entity me) -{ - entity e; - - int col = 0, width = 1.5; - me.gotoRC(me, 0, col); - me.TD(me, 1, width, makeXonoticHeaderLabel(_("Topic"))); - me.TR(me); - me.TD(me, me.rows - 1, width, e = me.topicList); - e.onChange = XonoticGuideDialog_topicChangeNotify; - e.onChangeEntity = me; - - col += width, width = 2; - me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn); - me.TD(me, 1, width, makeXonoticHeaderLabel(_("Entry"))); - me.TR(me); - me.TD(me, me.rows - 1 - 1, width, e = me.entryList); - e.onChange = XonoticGuideDialog_entryChangeNotify; - e.onChangeEntity = me; - me.gotoRC(me, me.rows - 1, col); - me.entryList.stringFilterBox = makeXonoticInputBox_T(false, string_null, - _("Click here or Ctrl-F to provide a keyword to narrow down the map list. Ctrl-Delete to clear; Enter when done.")); - me.TD(me, 1, 0.3, makeXonoticTextLabel(0, _("Filter:"))); - me.TD(me, 1, width - 0.3, e = me.entryList.stringFilterBox); - e.onChange = EntryList_StringFilterBox_Change; - e.keyDown = EntryList_StringFilterBox_keyDown; - e.onChangeEntity = me.entryList; - - col += width, width = 2.5; - me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn); - me.TD(me, 1, width, makeXonoticHeaderLabel(_("Description"))); - me.TR(me); - me.TD(me, me.rows - 1, width, me.descriptionPane); - - me.topicChangeNotify(me.topicList, me); -} - -void XonoticGuideDialog_topicChangeNotify(entity, entity me) -{ - entity topics = me.topicList; - entity entries = me.entryList; - int i = topics.selectedItem; - int idx = 0; - entity found = NULL; - #define TOPIC(src, name, icon) \ - if (idx++ == i) \ - { \ - static entity e; \ - if (!e) e = src; \ - found = e; \ - break; \ - } - do { TOPICS(TOPIC); } - while (0); - #undef TOPIC - entries.source = found; - entries.refilter(entries); - entries.setSelected(entries, 0); -} -void XonoticGuideDialog_entryChangeNotify(entity, entity me) -{ - entity desc = me.descriptionPane; - entity entries = me.entryList; - entity e = entries.source.getEntry(entries.source, entries.selectedItem, func_null); - string s = e.describe(e); - if (gamestatus & GAME_DEVELOPER) - s = sprintf("entity %i\n\n%s", e, s); - desc.setDescription(desc, s); -} diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qh deleted file mode 100644 index 311935c581..0000000000 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qh +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include - -#include "dialog.qh" -CLASS(XonoticGuideDialog, XonoticDialog) - ATTRIB(XonoticGuideDialog, title, string, _("Guide")); - ATTRIB(XonoticGuideDialog, name, string, "guide"); - ATTRIB(XonoticGuideDialog, color, vector, SKINCOLOR_DIALOG_GUIDE); - ATTRIB(XonoticGuideDialog, rows, float, 21); - ATTRIB(XonoticGuideDialog, columns, float, 6); - ATTRIB(XonoticGuideDialog, intendedWidth, float, 0.9); - METHOD(XonoticGuideDialog, fill, void(entity)); - METHOD(XonoticGuideDialog, topicChangeNotify, void(entity, entity)); - METHOD(XonoticGuideDialog, entryChangeNotify, void(entity, entity)); - - ATTRIB(XonoticGuideDialog, topicList, entity, NEW(XonoticTopicList, NEW(TopicSource))); - ATTRIB(XonoticGuideDialog, entryList, entity, NEW(XonoticEntryList, NULL)); - ATTRIB(XonoticGuideDialog, descriptionPane, entity, NEW(XonoticGuideDescription)); -ENDCLASS(XonoticGuideDialog) diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc new file mode 100644 index 0000000000..7fcc095542 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc @@ -0,0 +1,75 @@ +#include "dialog_singleplayer_guide.qh" + +#include "inputbox.qh" +#include "textlabel.qh" +#include + +void XonoticGuideDialog_fill(entity me) +{ + entity e; + + int col = 0, width = 1.5; + me.gotoRC(me, 0, col); + me.TD(me, 1, width, makeXonoticHeaderLabel(_("Topic"))); + me.TR(me); + me.TD(me, me.rows - 1, width, e = me.topicList); + e.onChange = XonoticGuideDialog_topicChangeNotify; + e.onChangeEntity = me; + + col += width, width = 2; + me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn); + me.TD(me, 1, width, makeXonoticHeaderLabel(_("Entry"))); + me.TR(me); + me.TD(me, me.rows - 1 - 1, width, e = me.entryList); + e.onChange = XonoticGuideDialog_entryChangeNotify; + e.onChangeEntity = me; + me.gotoRC(me, me.rows - 1, col); + me.entryList.stringFilterBox = makeXonoticInputBox_T(false, string_null, + _("Click here or Ctrl-F to provide a keyword to narrow down the map list. Ctrl-Delete to clear; Enter when done.")); + me.TD(me, 1, 0.3, makeXonoticTextLabel(0, _("Filter:"))); + me.TD(me, 1, width - 0.3, e = me.entryList.stringFilterBox); + e.onChange = EntryList_StringFilterBox_Change; + e.keyDown = EntryList_StringFilterBox_keyDown; + e.onChangeEntity = me.entryList; + + col += width, width = 2.5; + me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn); + me.TD(me, 1, width, makeXonoticHeaderLabel(_("Description"))); + me.TR(me); + me.TD(me, me.rows - 1, width, me.descriptionPane); + + me.topicChangeNotify(me.topicList, me); +} + +void XonoticGuideDialog_topicChangeNotify(entity, entity me) +{ + entity topics = me.topicList; + entity entries = me.entryList; + int i = topics.selectedItem; + int idx = 0; + entity found = NULL; + #define TOPIC(src, name, icon) \ + if (idx++ == i) \ + { \ + static entity e; \ + if (!e) e = src; \ + found = e; \ + break; \ + } + do { TOPICS(TOPIC); } + while (0); + #undef TOPIC + entries.source = found; + entries.refilter(entries); + entries.setSelected(entries, 0); +} +void XonoticGuideDialog_entryChangeNotify(entity, entity me) +{ + entity desc = me.descriptionPane; + entity entries = me.entryList; + entity e = entries.source.getEntry(entries.source, entries.selectedItem, func_null); + string s = e.describe(e); + if (gamestatus & GAME_DEVELOPER) + s = sprintf("entity %i\n\n%s", e, s); + desc.setDescription(desc, s); +} diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh new file mode 100644 index 0000000000..311935c581 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh @@ -0,0 +1,20 @@ +#pragma once + +#include + +#include "dialog.qh" +CLASS(XonoticGuideDialog, XonoticDialog) + ATTRIB(XonoticGuideDialog, title, string, _("Guide")); + ATTRIB(XonoticGuideDialog, name, string, "guide"); + ATTRIB(XonoticGuideDialog, color, vector, SKINCOLOR_DIALOG_GUIDE); + ATTRIB(XonoticGuideDialog, rows, float, 21); + ATTRIB(XonoticGuideDialog, columns, float, 6); + ATTRIB(XonoticGuideDialog, intendedWidth, float, 0.9); + METHOD(XonoticGuideDialog, fill, void(entity)); + METHOD(XonoticGuideDialog, topicChangeNotify, void(entity, entity)); + METHOD(XonoticGuideDialog, entryChangeNotify, void(entity, entity)); + + ATTRIB(XonoticGuideDialog, topicList, entity, NEW(XonoticTopicList, NEW(TopicSource))); + ATTRIB(XonoticGuideDialog, entryList, entity, NEW(XonoticEntryList, NULL)); + ATTRIB(XonoticGuideDialog, descriptionPane, entity, NEW(XonoticGuideDescription)); +ENDCLASS(XonoticGuideDialog) diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc index 7ebd9d3ebd..e94ae5a9d4 100644 --- a/qcsrc/menu/xonotic/mainwindow.qc +++ b/qcsrc/menu/xonotic/mainwindow.qc @@ -35,9 +35,9 @@ #include "dialog_settings_misc_reset.qh" #include "dialog_settings_user_languagewarning.qh" #include "dialog_settings_game_hudconfirm.qh" +#include "dialog_singleplayer_guide.qh" #include "dialog_singleplayer_winner.qh" #include "dialog_multiplayer_join_serverinfo.qh" -#include "dialog_multiplayer_media_guide.qh" #include "dialog_multiplayer_media_demo_startconfirm.qh" #include "dialog_multiplayer_media_demo_timeconfirm.qh" #include "dialog_multiplayer_media_screenshot_viewer.qh"