Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:jahshaka/VR
- Loading branch information
Showing
44 changed files
with
1,814 additions
and
949 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <ui version="4.0"> | ||
| <class>DonateDialog</class> | ||
| <widget class="QWidget" name="DonateDialog"> | ||
| <property name="geometry"> | ||
| <rect> | ||
| <x>0</x> | ||
| <y>0</y> | ||
| <width>815</width> | ||
| <height>480</height> | ||
| </rect> | ||
| </property> | ||
| <property name="minimumSize"> | ||
| <size> | ||
| <width>0</width> | ||
| <height>0</height> | ||
| </size> | ||
| </property> | ||
| <property name="maximumSize"> | ||
| <size> | ||
| <width>16777215</width> | ||
| <height>16777215</height> | ||
| </size> | ||
| </property> | ||
| <property name="windowTitle"> | ||
| <string>Donate</string> | ||
| </property> | ||
| <property name="styleSheet"> | ||
| <string notr="true">#Donate { | ||
| border: 1px solid black; | ||
| } | ||
|
|
||
| QCheckBox { | ||
| spacing: 5px; | ||
| font-size: 12px; | ||
| } | ||
|
|
||
| QCheckBox::indicator { | ||
| width: 20px; | ||
| height: 20px; | ||
| } | ||
|
|
||
| QCheckBox::indicator::unchecked { | ||
| image: url(:/icons/check-unchecked.png); | ||
| } | ||
|
|
||
| QCheckBox::indicator::checked { | ||
| image: url(:/icons/check-checked.png); | ||
| } | ||
| </string> | ||
| </property> | ||
| <layout class="QVBoxLayout" name="verticalLayout"> | ||
| <property name="spacing"> | ||
| <number>0</number> | ||
| </property> | ||
| <property name="leftMargin"> | ||
| <number>0</number> | ||
| </property> | ||
| <property name="topMargin"> | ||
| <number>0</number> | ||
| </property> | ||
| <property name="rightMargin"> | ||
| <number>0</number> | ||
| </property> | ||
| <property name="bottomMargin"> | ||
| <number>0</number> | ||
| </property> | ||
| <item> | ||
| <widget class="QLabel" name="label"> | ||
| <property name="maximumSize"> | ||
| <size> | ||
| <width>815</width> | ||
| <height>480</height> | ||
| </size> | ||
| </property> | ||
| <property name="text"> | ||
| <string/> | ||
| </property> | ||
| <property name="pixmap"> | ||
| <pixmap resource="../../app/images.qrc">:/images/splashv3_d.png</pixmap> | ||
| </property> | ||
| <property name="scaledContents"> | ||
| <bool>true</bool> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| <item> | ||
| <widget class="QWidget" name="ctrl" native="true"> | ||
| <property name="styleSheet"> | ||
| <string notr="true">#ctrl { | ||
| background: #111; | ||
| } | ||
|
|
||
| QPushButton, QToolButton { | ||
| border: 0; | ||
| padding: 6px 24px; | ||
| background: #444; | ||
| } | ||
|
|
||
| QPushButton::hover { | ||
| background: #555; | ||
| } | ||
|
|
||
| QToolButton::hover { | ||
| background: #555; | ||
| }</string> | ||
| </property> | ||
| <layout class="QHBoxLayout" name="horizontalLayout"> | ||
| <property name="leftMargin"> | ||
| <number>4</number> | ||
| </property> | ||
| <property name="topMargin"> | ||
| <number>4</number> | ||
| </property> | ||
| <property name="rightMargin"> | ||
| <number>4</number> | ||
| </property> | ||
| <property name="bottomMargin"> | ||
| <number>4</number> | ||
| </property> | ||
| <item> | ||
| <widget class="QCheckBox" name="checkBox"> | ||
| <property name="text"> | ||
| <string>I have already donated. Don't show me this again</string> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| <item> | ||
| <spacer name="horizontalSpacer"> | ||
| <property name="orientation"> | ||
| <enum>Qt::Horizontal</enum> | ||
| </property> | ||
| <property name="sizeHint" stdset="0"> | ||
| <size> | ||
| <width>40</width> | ||
| <height>20</height> | ||
| </size> | ||
| </property> | ||
| </spacer> | ||
| </item> | ||
| <item> | ||
| <widget class="QPushButton" name="close"> | ||
| <property name="text"> | ||
| <string>Close</string> | ||
| </property> | ||
| </widget> | ||
| </item> | ||
| </layout> | ||
| </widget> | ||
| </item> | ||
| </layout> | ||
| </widget> | ||
| <resources> | ||
| <include location="../../app/images.qrc"/> | ||
| </resources> | ||
| <connections/> | ||
| </ui> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #include "donatedialog.h" | ||
| #include "ui_donate.h" | ||
| #include "../core/settingsmanager.h" | ||
|
|
||
| DonateDialog::DonateDialog(QDialog *parent) : QDialog(parent), ui(new Ui::DonateDialog) | ||
| { | ||
| ui->setupUi(this); | ||
| setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint | Qt::FramelessWindowHint); | ||
|
|
||
| connect(ui->checkBox, SIGNAL(pressed()), this, SLOT(saveAndClose())); | ||
| connect(ui->close, SIGNAL(pressed()), this, SLOT(close())); | ||
|
|
||
| settingsManager = SettingsManager::getDefaultManager(); | ||
| } | ||
|
|
||
| DonateDialog::~DonateDialog() | ||
| { | ||
| delete ui; | ||
| } | ||
|
|
||
| void DonateDialog::saveAndClose() | ||
| { | ||
| settingsManager->setValue("ddialog_seen", true); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #ifndef DONATEDIALOG_HPP | ||
| #define DONATEDIALOG_HPP | ||
|
|
||
| #include <QDialog> | ||
|
|
||
| namespace Ui { | ||
| class DonateDialog; | ||
| } | ||
|
|
||
| class SettingsManager; | ||
|
|
||
| class DonateDialog : public QDialog | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| DonateDialog(QDialog *parent = Q_NULLPTR); | ||
| ~DonateDialog(); | ||
|
|
||
| public slots: | ||
| void saveAndClose(); | ||
|
|
||
| private: | ||
| Ui::DonateDialog *ui; | ||
| SettingsManager *settingsManager; | ||
| }; | ||
|
|
||
| #endif // DONATEDIALOG_HPP |
Oops, something went wrong.