Add About info for release

Slattz · Aug 28, 2018 · fa11792 · fa11792
1 parent 1716036
commit fa11792
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,4 +44,7 @@ CMakeLists.txt.user*
 
 #Others
 /build
-/rom
+/rom
+/ACNL_REditor
+/Orig_*
+/PreInstalled_WA_*
diff --git a/ACNL_REditor.pro b/ACNL_REditor.pro
@@ -11,6 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = ACNL_REditor
 RC_ICONS = icon.ico
 TEMPLATE = app
+RESOURCES = resources.qrc
 
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings

diff --git a/aboutwindow.cpp b/aboutwindow.cpp
@@ -2,13 +2,11 @@
 #include "ui_aboutwindow.h"
 #include <QPushButton>
 
-AboutWindow::AboutWindow(QString exedir, QWidget *parent) :
+AboutWindow::AboutWindow(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::AboutWindow)
 {
     ui->setupUi(this);
-    QPixmap pix(exedir + "/resources/icon.bmp");
-    ui->icon->setPixmap(pix);
 }
 
 AboutWindow::~AboutWindow()

diff --git a/aboutwindow.h b/aboutwindow.h
@@ -13,7 +13,7 @@ class AboutWindow : public QDialog
     Q_OBJECT
 
 public:
-    explicit AboutWindow(QString exedir, QWidget *parent = nullptr);
+    explicit AboutWindow(QWidget *parent = nullptr);
     ~AboutWindow();
 
 private slots:

diff --git a/aboutwindow.ui b/aboutwindow.ui
@@ -6,10 +6,22 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>455</width>
-    <height>333</height>
+    <width>500</width>
+    <height>350</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>500</width>
+    <height>350</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>500</width>
+    <height>350</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>About ACNL REditor</string>
   </property>
@@ -19,12 +31,18 @@
   <widget class="QTextBrowser" name="textBrowser">
    <property name="geometry">
     <rect>
-     <x>170</x>
+     <x>190</x>
      <y>0</y>
-     <width>291</width>
-     <height>331</height>
+     <width>311</width>
+     <height>350</height>
     </rect>
    </property>
+   <property name="maximumSize">
+    <size>
+     <width>320</width>
+     <height>16777215</height>
+    </size>
+   </property>
    <property name="font">
     <font>
      <pointsize>10</pointsize>
@@ -45,14 +63,18 @@ p, li { white-space: pre-wrap; }
 &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; font-weight:600; text-decoration: underline;&quot;&gt;ACNL REditor v1.0 by Slattz&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Github: &lt;/span&gt;&lt;a href=&quot;https://github.com/Slattz/ACNL_REditor&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;ACNL_REditor&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;License: &lt;/span&gt;&lt;a href=&quot;https://github.com/Slattz/ACNL_REditor/blob/master/LICENSE&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;MIT License&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Donate: &lt;/span&gt;&lt;a href=&quot;https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;amp;hosted_button_id=APDWE9ZED4VBW&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Paypal&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Made using QT v5.11.1, which is licensed under &lt;a href=&quot;https://doc.qt.io/qt-5/lgpl.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;LGPLv3&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;ACNL REditor is not affiliated or endorsed by Nintendo in any way.&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;I am not responsible for any damage you somehow cause to your electronics.&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Special Thanks to the following:&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Cuyler, Levi, Rydog, Scotline, WemI0&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Special Thanks to the following for their work on ACNL:&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Cuyler, Levi, Rydog, Sc0tline, WemI0&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
    <property name="textInteractionFlags">
     <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
@@ -61,8 +83,8 @@ p, li { white-space: pre-wrap; }
   <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>370</x>
-     <y>300</y>
+     <x>420</x>
+     <y>320</y>
      <width>75</width>
      <height>23</height>
     </rect>
@@ -85,8 +107,8 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>-30</x>
      <y>10</y>
-     <width>231</width>
-     <height>221</height>
+     <width>221</width>
+     <height>211</height>
     </rect>
    </property>
    <property name="autoFillBackground">
@@ -95,12 +117,20 @@ p, li { white-space: pre-wrap; }
    <property name="text">
     <string/>
    </property>
+   <property name="pixmap">
+    <pixmap resource="resources.qrc">:/resources/icon.png</pixmap>
+   </property>
    <property name="textInteractionFlags">
     <set>Qt::NoTextInteraction</set>
    </property>
   </widget>
+  <zorder>icon</zorder>
+  <zorder>textBrowser</zorder>
+  <zorder>buttonBox</zorder>
  </widget>
- <resources/>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

diff --git a/icon.bmp b/icon.bmp
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -156,7 +156,7 @@ void MainWindow::on_BTN_ShopTimes_clicked()
 void MainWindow::on_actionAbout_triggered()
 {
     qDebug() << "About Pressed";
-    AboutWindow aboutWindow(exedir);
+    AboutWindow aboutWindow;
     aboutWindow.setStyleSheet("background-color: white;");
     aboutWindow.setModal(false);
     aboutWindow.exec();

diff --git a/resources.qrc b/resources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>resources/icon.png</file>
+    </qresource>
+</RCC>
diff --git a/resources/icon.png b/resources/icon.png
diff --git a/shophourseditor.ui b/shophourseditor.ui
@@ -16,9 +16,6 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
      <property name="usesScrollButtons">
       <bool>true</bool>
      </property>
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,4 +44,7 @@ CMakeLists.txt.user* @@
     #Others
     /build
-    /rom
+    /rom
+    /ACNL_REditor
+    /Orig_*
+    /PreInstalled_WA_*