diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt | 1 | ||||
| -rw-r--r-- | src/android/app/src/main/res/drawable/ic_x.xml | 9 | ||||
| -rw-r--r-- | src/android/app/src/main/res/layout-w600dp/fragment_about.xml | 11 | ||||
| -rw-r--r-- | src/android/app/src/main/res/layout/fragment_about.xml | 12 | ||||
| -rw-r--r-- | src/android/app/src/main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 5 | ||||
| -rw-r--r-- | src/yuzu/main.h | 1 | ||||
| -rw-r--r-- | src/yuzu/main.ui | 12 |
9 files changed, 53 insertions, 0 deletions
@@ -51,6 +51,7 @@ Check out our [website](https://eden-emu.dev) for the latest news on exciting fe ## Development Most of the development happens on our Git server. It is also where [our central repository](https://git.eden-emu.dev/eden-emu/eden) is hosted. For development discussions, please join us on [Discord](https://discord.gg/kXAmGCXBGD) or [Revolt](https://rvlt.gg/qKgFEAbH). +You can also follow us on [X (Twitter)](https://x.com/edenemuofficial) for updates and announcements. If you would like to contribute, we are open to new developers and pull requests. Please ensure that your work is of a high standard and properly documented. You can also contact any of the developers on Discord or Revolt to learn more about the current state of the emulator. diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt index 6f0493cbf8..88ec13dd4c 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt @@ -96,6 +96,7 @@ class AboutFragment : Fragment() { binding.buttonDiscord.setOnClickListener { openLink(getString(R.string.discord_link)) } binding.buttonRevolt.setOnClickListener { openLink(getString(R.string.revolt_link)) } + binding.buttonX.setOnClickListener { openLink(getString(R.string.x_link)) } binding.buttonWebsite.setOnClickListener { openLink(getString(R.string.website_link)) } binding.buttonGithub.setOnClickListener { openLink(getString(R.string.github_link)) } diff --git a/src/android/app/src/main/res/drawable/ic_x.xml b/src/android/app/src/main/res/drawable/ic_x.xml new file mode 100644 index 0000000000..d93c8d6b63 --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_x.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="120" + android:viewportHeight="120"> + <path + android:fillColor="#000000" + android:pathData="M95.26,0H113L72.12,51.27L120,120H82.83L53.89,78.31L20.57,120H2.7L45.74,65.01L0,0H38.18L65.22,38.9Z" /> + </vector> diff --git a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml index f6de2f590e..9d9cf10bf8 100644 --- a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml +++ b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml @@ -231,6 +231,17 @@ app:iconPadding="0dp" /> <com.google.android.material.button.MaterialButton + android:id="@+id/button_x" + style="@style/EdenButton.Secondary" + android:layout_width="56dp" + android:layout_height="56dp" + android:layout_marginEnd="12dp" + app:icon="@drawable/ic_x" + app:iconGravity="textStart" + app:iconSize="24dp" + app:iconPadding="0dp" /> + + <com.google.android.material.button.MaterialButton android:id="@+id/button_website" style="@style/EdenButton.Secondary" android:layout_width="56dp" diff --git a/src/android/app/src/main/res/layout/fragment_about.xml b/src/android/app/src/main/res/layout/fragment_about.xml index 67ad553036..aa8365608a 100644 --- a/src/android/app/src/main/res/layout/fragment_about.xml +++ b/src/android/app/src/main/res/layout/fragment_about.xml @@ -227,6 +227,18 @@ <com.google.android.material.button.MaterialButton style="@style/EdenButton.Secondary" + android:id="@+id/button_x" + android:layout_width="0dp" + android:layout_height="56dp" + android:layout_weight="1" + android:layout_marginEnd="8dp" + app:icon="@drawable/ic_x" + app:iconSize="24dp" + app:iconGravity="textStart" + app:iconPadding="0dp" /> + + <com.google.android.material.button.MaterialButton + style="@style/EdenButton.Secondary" android:id="@+id/button_website" android:layout_width="0dp" android:layout_height="56dp" diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index d649ba08ac..f1991fee1b 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -444,6 +444,7 @@ <string name="user_data_import_failed_description">Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again.</string> <string name="discord_link" translatable="false">https://discord.gg/kXAmGCXBGD</string> <string name="revolt_link" translatable="false">https://rvlt.gg/qKgFEAbH</string> + <string name="x_link" translatable="false">https://x.com/edenemuofficial</string> <string name="website_link" translatable="false">https://eden-emu.dev</string> <string name="github_link" translatable="false">https://git.eden-emu.dev/eden-emu</string> diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 4e0ff685bf..2c3c46114d 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1764,6 +1764,7 @@ void GMainWindow::ConnectMenuEvents() { 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_Firmware_From_Folder, &GMainWindow::OnInstallFirmware); connect_menu(ui->action_Firmware_From_ZIP, &GMainWindow::OnInstallFirmwareFromZIP); @@ -3750,6 +3751,10 @@ void GMainWindow::OnOpenRevolt() { OpenURL(QUrl(QStringLiteral("https://rvlt.gg/qKgFEAbH"))); } +void GMainWindow::OnOpenX() { + OpenURL(QUrl(QStringLiteral("https://x.com/edenemuofficial"))); +} + void GMainWindow::ToggleFullscreen() { if (!emulation_running) { return; diff --git a/src/yuzu/main.h b/src/yuzu/main.h index c7dd2a45fa..8a34a9f075 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -347,6 +347,7 @@ private slots: void OnOpenFAQ(); void OnOpenDiscord(); void OnOpenRevolt(); + void OnOpenX(); /// Called whenever a user selects a game in the game list widget. void OnGameListLoadFile(QString game_path, u64 program_id); diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui index ac8a2b594e..5f56c9e6d1 100644 --- a/src/yuzu/main.ui +++ b/src/yuzu/main.ui @@ -215,6 +215,7 @@ <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_Eden_Dependencies"/> @@ -562,6 +563,17 @@ <string>From ZIP</string> </property> </action> + <action name="action_X"> + <property name="text"> + <string>&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>&Revolt</string> |