mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-01 16:05:07 +01:00
More UI updates.
This commit is contained in:
parent
2df085db51
commit
5800d9c48e
@ -57,7 +57,7 @@
|
|||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p><span style=" font-size:28pt;">Citra</span></p></body></html></string>
|
<string><html><head/><body><p><span style=" font-size:28pt;">Lime</span></p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -87,7 +87,7 @@
|
|||||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||||
p, li { white-space: pre-wrap; }
|
p, li { white-space: pre-wrap; }
|
||||||
</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
|
</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Citra is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.</span></p>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Lime is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.</span></p>
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p>
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html></string>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="lbl_Spiel">
|
<widget class="QLabel" name="lbl_Spiel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://citra-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Lime Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of Citra you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected Citra account</li></ul></body></html></string>
|
<string><html><head/><body><p><span style=" font-size:10pt;">Should you choose to submit a test case to the </span><a href="https://citra-emu.org/game/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Lime Compatibility List</span></a><span style=" font-size:10pt;">, The following information will be collected and displayed on the site:</span></p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hardware Information (CPU / GPU / Operating System)</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Which version of Lime you are running</li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The connected Citra account</li></ul></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@ -179,7 +179,7 @@
|
|||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p>Independent of speed or performance, how well does this game play from start to finish on this version of Citra?</p></body></html></string>
|
<string><html><head/><body><p>Independent of speed or performance, how well does this game play from start to finish on this version of Lime?</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<class>ConfigureDialog</class>
|
<class>ConfigureDialog</class>
|
||||||
<widget class="QDialog" name="ConfigureDialog">
|
<widget class="QDialog" name="ConfigureDialog">
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Citra Configuration</string>
|
<string>Lime Configuration</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<item>
|
<item>
|
||||||
|
@ -269,7 +269,7 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent)
|
|||||||
ui->label_nus_download->setTextInteractionFlags(Qt::TextBrowserInteraction);
|
ui->label_nus_download->setTextInteractionFlags(Qt::TextBrowserInteraction);
|
||||||
ui->label_nus_download->setOpenExternalLinks(true);
|
ui->label_nus_download->setOpenExternalLinks(true);
|
||||||
ui->label_nus_download->setText(
|
ui->label_nus_download->setText(
|
||||||
tr("Citra is missing keys to download system files. <br><a "
|
tr("Lime is missing keys to download system files. <br><a "
|
||||||
"href='https://citra-emu.org/wiki/aes-keys/'><span style=\"text-decoration: "
|
"href='https://citra-emu.org/wiki/aes-keys/'><span style=\"text-decoration: "
|
||||||
"underline; color:#039be5;\">How to get keys?</span></a>"));
|
"underline; color:#039be5;\">How to get keys?</span></a>"));
|
||||||
}
|
}
|
||||||
@ -611,9 +611,9 @@ void ConfigureSystem::DownloadFromNUS() {
|
|||||||
future_watcher.waitForFinished();
|
future_watcher.waitForFinished();
|
||||||
|
|
||||||
if (failed) {
|
if (failed) {
|
||||||
QMessageBox::critical(this, tr("Citra"), tr("Downloading system files failed."));
|
QMessageBox::critical(this, tr("Lime"), tr("Downloading system files failed."));
|
||||||
} else if (!future_watcher.isCanceled()) {
|
} else if (!future_watcher.isCanceled()) {
|
||||||
QMessageBox::information(this, tr("Citra"), tr("Successfully downloaded system files."));
|
QMessageBox::information(this, tr("Lime"), tr("Successfully downloaded system files."));
|
||||||
}
|
}
|
||||||
|
|
||||||
ui->button_start_download->setEnabled(true);
|
ui->button_start_download->setEnabled(true);
|
||||||
|
@ -19,13 +19,13 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="groupBoxWebConfig">
|
<widget class="QGroupBox" name="groupBoxWebConfig">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Citra Web Service</string>
|
<string>Lime Web Service</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayoutCitraWebService">
|
<layout class="QVBoxLayout" name="verticalLayoutCitraWebService">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="web_credentials_disclaimer">
|
<widget class="QLabel" name="web_credentials_disclaimer">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>By providing your username and token, you agree to allow Citra to collect additional usage data, which may include user identifying information.</string>
|
<string>Currently not supported by Lime. By providing your username and token, you agree to allow Citra to collect additional usage data, which may include user identifying information.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -128,7 +128,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="toggle_telemetry">
|
<widget class="QCheckBox" name="toggle_telemetry">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Share anonymous usage data with the Citra team</string>
|
<string>Share anonymous usage data with the Lime team</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -233,7 +233,7 @@ GMainWindow::GMainWindow(Core::System& system_)
|
|||||||
ConnectMenuEvents();
|
ConnectMenuEvents();
|
||||||
ConnectWidgetEvents();
|
ConnectWidgetEvents();
|
||||||
|
|
||||||
LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
LOG_INFO(Frontend, "Lime Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
||||||
Common::g_scm_desc);
|
Common::g_scm_desc);
|
||||||
#if CITRA_ARCH(x86_64)
|
#if CITRA_ARCH(x86_64)
|
||||||
const auto& caps = Common::GetCPUCaps();
|
const auto& caps = Common::GetCPUCaps();
|
||||||
|
Loading…
Reference in New Issue
Block a user