eden-emu
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Releases Wiki Activity
Browse Source

[qt] move Discord/revolt/X links to the about section (#2883) 

highly subjective change
Signed-off-by: lizzie <lizzie@eden-emu.dev>

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2883
Reviewed-by: crueter <crueter@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
pull/2885/head
lizzie 4 months ago
committed by crueter
parent
5c6aaa7eb1
commit
2924297790
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
4 changed files with 2 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/yuzu/aboutdialog.ui
  2. 15
      src/yuzu/main.cpp
  3. 3
      src/yuzu/main.h
  4. 34
      src/yuzu/main.ui

4
src/yuzu/aboutdialog.ui
View File

@ -128,7 +128,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
<item> <item>
<widget class="QLabel" name="labelLinks"> <widget class="QLabel" name="labelLinks">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://eden-emulator.github.io/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Website&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://git.eden-emu.dev&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Source Code&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://git.eden-emu.dev/eden-emu/eden/activity/contributors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Contributors&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://git.eden-emu.dev/eden-emu/eden/src/branch/master/LICENSE.txt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;License&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://eden-emulator.github.io/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Website&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://git.eden-emu.dev&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Source Code&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://git.eden-emu.dev/eden-emu/eden/activity/contributors&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Contributors&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://discord.gg/kXAmGCXBGD&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Discord&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://rvlt.gg/qKgFEAbH&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Revolt&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://nitter.poast.org/edenemuofficial&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;Twitter&lt;/span&gt;&lt;/a&gt; | &lt;a href=&quot;https://git.eden-emu.dev/eden-emu/eden/src/branch/master/LICENSE.txt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#039be5;&quot;&gt;License&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
@ -144,7 +144,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;&amp;quot;Nintendo Switch&amp;quot; is a trademark of Nintendo. eden is not affiliated with Nintendo in any way.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;&amp;quot;Nintendo Switch&amp;quot; is a trademark of Nintendo. Eden is not affiliated with Nintendo in any way.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>

15
src/yuzu/main.cpp
View File

@ -1708,9 +1708,6 @@ void GMainWindow::ConnectMenuEvents() {
connect_menu(ui->action_Mod_Folder, &GMainWindow::OnOpenModFolder); connect_menu(ui->action_Mod_Folder, &GMainWindow::OnOpenModFolder);
connect_menu(ui->action_Log_Folder, &GMainWindow::OnOpenLogFolder); connect_menu(ui->action_Log_Folder, &GMainWindow::OnOpenLogFolder);
connect_menu(ui->action_Discord, &GMainWindow::OnOpenDiscord);
connect_menu(ui->action_Revolt, &GMainWindow::OnOpenRevolt);
connect_menu(ui->action_X, &GMainWindow::OnOpenX);
connect_menu(ui->action_Verify_installed_contents, &GMainWindow::OnVerifyInstalledContents); connect_menu(ui->action_Verify_installed_contents, &GMainWindow::OnVerifyInstalledContents);
connect_menu(ui->action_Firmware_From_Folder, &GMainWindow::OnInstallFirmware); connect_menu(ui->action_Firmware_From_Folder, &GMainWindow::OnInstallFirmware);
connect_menu(ui->action_Firmware_From_ZIP, &GMainWindow::OnInstallFirmwareFromZIP); connect_menu(ui->action_Firmware_From_ZIP, &GMainWindow::OnInstallFirmwareFromZIP);
@ -3359,18 +3356,6 @@ void GMainWindow::OnOpenFAQ() {
OpenURL(QUrl(QStringLiteral("https://yuzu-mirror.github.io/help"))); OpenURL(QUrl(QStringLiteral("https://yuzu-mirror.github.io/help")));
} }
void GMainWindow::OnOpenDiscord() {
OpenURL(QUrl(QStringLiteral("https://discord.gg/HstXbPch7X")));
}
void GMainWindow::OnOpenRevolt() {
OpenURL(QUrl(QStringLiteral("https://rvlt.gg/qKgFEAbH")));
}
void GMainWindow::OnOpenX() {
OpenURL(QUrl(QStringLiteral("https://x.com/edenemuofficial")));
}
void GMainWindow::ToggleFullscreen() { void GMainWindow::ToggleFullscreen() {
if (!emulation_running) { if (!emulation_running) {
return; return;

3
src/yuzu/main.h
View File

@ -333,9 +333,6 @@ private slots:
void OnOpenModsPage(); void OnOpenModsPage();
void OnOpenQuickstartGuide(); void OnOpenQuickstartGuide();
void OnOpenFAQ(); void OnOpenFAQ();
void OnOpenDiscord();
void OnOpenRevolt();
void OnOpenX();
/// Called whenever a user selects a game in the game list widget. /// Called whenever a user selects a game in the game list widget.
void OnGameListLoadFile(QString game_path, u64 program_id); void OnGameListLoadFile(QString game_path, u64 program_id);

34
src/yuzu/main.ui
View File

@ -220,10 +220,6 @@
<addaction name="action_Open_Quickstart_Guide"/> <addaction name="action_Open_Quickstart_Guide"/>
<addaction name="action_Open_FAQ"/> <addaction name="action_Open_FAQ"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="action_Discord"/>
<addaction name="action_Revolt"/>
<addaction name="action_X"/>
<addaction name="separator"/>
<addaction name="action_About"/> <addaction name="action_About"/>
<addaction name="action_Eden_Dependencies"/> <addaction name="action_Eden_Dependencies"/>
</widget> </widget>
@ -512,11 +508,6 @@
<string>Open &amp;Home Menu</string> <string>Open &amp;Home Menu</string>
</property> </property>
</action> </action>
<action name="action_Discord">
<property name="text">
<string>&amp;Discord</string>
</property>
</action>
<action name="action_Open_Setup"> <action name="action_Open_Setup">
<property name="text"> <property name="text">
<string>Open &amp;Setup</string> <string>Open &amp;Setup</string>
@ -570,31 +561,6 @@
<string>From ZIP</string> <string>From ZIP</string>
</property> </property>
</action> </action>
<action name="action_X">
<property name="text">
<string>&amp;X</string>
</property>
<property name="toolTip">
<string>X (Twitter)</string>
</property>
<property name="statusTip">
<string/>
</property>
</action>
<action name="action_Revolt">
<property name="text">
<string>&amp;Revolt</string>
</property>
<property name="toolTip">
<string>Revolt</string>
</property>
<property name="statusTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
</action>
<action name="action_Eden_Dependencies"> <action name="action_Eden_Dependencies">
<property name="text"> <property name="text">
<string>&amp;Eden Dependencies</string> <string>&amp;Eden Dependencies</string>

Write Preview
Loading…
Cancel
Save