فهرست منبع

first about draft

Nicolas Winkler 4 سال پیش
والد
کامیت
f8bff6a7be
7فایلهای تغییر یافته به همراه118 افزوده شده و 11 حذف شده
  1. 3 0
      Almond.pro
  2. 22 0
      include/About.h
  3. 4 0
      include/Almond.h
  4. 16 0
      src/About.cpp
  5. 12 0
      src/Almond.cpp
  6. 37 0
      ui/About.ui
  7. 24 11
      ui/Almond.ui

+ 3 - 0
Almond.pro

@@ -27,6 +27,7 @@ CONFIG += c++17
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
 
 SOURCES += \
+        src/About.cpp \
         src/Almond.cpp \
         src/AlmondMenuWidget.cpp \
         src/BackgroundTask.cpp \
@@ -45,6 +46,7 @@ SOURCES += \
         src/main.cpp
 
 HEADERS += \
+        include/About.h \
         include/Almond.h \
         include/AlmondMenuWidget.h \
         include/BackgroundTask.h \
@@ -62,6 +64,7 @@ HEADERS += \
         include/GridFlowLayout.h
 
 FORMS += \
+        ui/About.ui \
         ui/Almond.ui \
         ui/ExportImageMenu.ui \
         ui/ExportVideoMenu.ui \

+ 22 - 0
include/About.h

@@ -0,0 +1,22 @@
+#ifndef ABOUT_H
+#define ABOUT_H
+
+#include <QWidget>
+
+namespace Ui {
+class About;
+}
+
+class About : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit About(QWidget* parent = nullptr);
+    ~About();
+
+private:
+    Ui::About *ui;
+};
+
+#endif // ABOUT_H

+ 4 - 0
include/Almond.h

@@ -16,6 +16,7 @@
 #include "ExportImageMenu.h"
 #include "ExportVideoMenu.h"
 #include "GradientMenu.h"
+#include "About.h"
 
 
 #include <memory>
@@ -46,6 +47,7 @@ private:
     AlmondMenuWidget* amw;
     ExportImageMenu* eim;
     ExportVideoMenu* evm;
+    About* about;
     GradientMenu* gradientMenu;
 
     bool fullscreenMode = false;
@@ -113,6 +115,8 @@ private slots:
     void on_createCustom_clicked();
     void on_cancelProgress_clicked();
 
+    void on_aboutBtn_clicked();
+
 private:
     Ui::AlmondClass ui;
 };

+ 16 - 0
src/About.cpp

@@ -0,0 +1,16 @@
+#include "About.h"
+#include "ui_About.h"
+
+
+About::About(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::About)
+{
+    ui->setupUi(this);
+}
+
+
+About::~About()
+{
+    delete ui;
+}

+ 12 - 0
src/Almond.cpp

@@ -48,10 +48,13 @@ Almond::Almond(QWidget* parent) :
     amw->setMainMenu(ui.dockWidgetContents_2);
     eim = new ExportImageMenu();
     evm = new ExportVideoMenu();
+    about = new About(this);
     gradientMenu = new GradientMenu();
     AlmondSubMenu* imageSm = amw->addSubMenu(eim);
     AlmondSubMenu* videoSm = amw->addSubMenu(evm);
     AlmondSubMenu* gradientSm = amw->addSubMenu(gradientMenu);
+    AlmondSubMenu* aboutSm = amw->addSubMenu(about);
+
     ui.dockWidget_2->setWidget(amw);
 
     connect(amw, &AlmondMenuWidget::submenuCancel, [this] (int) { amw->showMainMenu(); });
@@ -66,6 +69,9 @@ Almond::Almond(QWidget* parent) :
         fractalWidget->setGradient(gradientMenu->getGradient());
     });
 
+    connect(aboutSm, &AlmondSubMenu::accepted, [] () {});
+    connect(aboutSm, &AlmondSubMenu::cancelled, [] () {});
+
 
     /*QStatusBar* bar = new QStatusBar(this);
     bar->addWidget(new QLabel("ayay"));
@@ -496,3 +502,9 @@ void Almond::on_cancelProgress_clicked()
 {
     stopBackgroundTask();
 }
+
+
+void Almond::on_aboutBtn_clicked()
+{
+    amw->showSubMenu(3);
+}

+ 37 - 0
ui/About.ui

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>About</class>
+ <widget class="QWidget" name="About">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTextBrowser" name="textBrowser">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="html">
+      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p 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:12pt; font-weight:600;&quot;&gt;Almond 1.1.0&lt;/span&gt;&lt;/p&gt;
+&lt;p 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:12pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p 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:10pt;&quot;&gt;Almond is a free fractal viewer.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

+ 24 - 11
ui/Almond.ui

@@ -64,6 +64,9 @@
          <layout class="QGridLayout" name="gridLayout_2">
           <item row="1" column="1">
            <widget class="QPushButton" name="zoom_in">
+            <property name="text">
+             <string/>
+            </property>
             <property name="icon">
              <iconset resource="../resources/Almond.qrc">
               <normaloff>:/icons/zoom_in</normaloff>:/icons/zoom_in</iconset>
@@ -78,6 +81,9 @@
           </item>
           <item row="1" column="2">
            <widget class="QPushButton" name="zoom_out">
+            <property name="text">
+             <string/>
+            </property>
             <property name="icon">
              <iconset resource="../resources/Almond.qrc">
               <normaloff>:/icons/zoom_out</normaloff>:/icons/zoom_out</iconset>
@@ -299,17 +305,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="cancelProgress">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset theme="cancel">
-              <normaloff>.</normaloff>.</iconset>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0" colspan="2">
            <widget class="QPushButton" name="exportVideo">
             <property name="text">
@@ -324,9 +319,27 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="1">
+           <widget class="QPushButton" name="cancelProgress">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset theme="cancel">
+              <normaloff>.</normaloff>.</iconset>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="aboutBtn">
+         <property name="text">
+          <string>About</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
     </layout>