[SSC] Changing to more conventionel Widget.

Foxei · Nov 18, 2020 · 60ecb8c · 60ecb8c
1 parent 2e640a4
commit 60ecb8c
Show file tree

Hide file tree

Showing 50 changed files with 2,126 additions and 45 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,13 +28,13 @@ set(QT_RES
     ${CMAKE_SOURCE_DIR}/resources/resources.qrc
     ${CMAKE_SOURCE_DIR}/gui/gui.qrc)
 
+set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_SOURCE_DIR}/ui/)
+
 # Set Qt source files
 set(SRC ${QT_RES}
     src/papercards_qml.cpp
-    src/Backend.cpp
-    src/DocumentHandler.cpp
-    src/PdfHandler.cpp
-    src/model/Card.cpp)
+    src/mainwindow.cpp
+    src/sidepanel.cpp)
 
 # Copy version to source code
 add_definitions(-DMAJOR_VERSION=${PROJECT_VERSION_MAJOR})

diff --git a/Papercards.pro b/Papercards.pro
@@ -21,10 +21,14 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-SOURCES += src/papercards_qml.cpp src/Backend.cpp src/DocumentHandler.cpp src/model/Card.cpp
-HEADERS += src/Backend.h src/DocumentHandler.h src/model/Card.h
+SOURCES += src/papercards_qml.cpp src/Backend.cpp src/DocumentHandler.cpp src/model/Card.cpp \
+    src/mainwindow.cpp
+HEADERS += src/Backend.h src/DocumentHandler.h src/model/Card.h \
+    src/mainwindow.h \
+    src/material_icons.h
 
-RESOURCES += resources/resources.qrc gui/gui.qrc
+RESOURCES += resources/resources.qrc gui/gui.qrc \
+    ui/ui.qrc
 
 OTHER_FILES += gui/*.qml gui/components/*.qml
 
@@ -39,3 +43,6 @@ QML_DESIGNER_IMPORT_PATH =
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
+
+FORMS += \
+    ui/mainwindow.ui
diff --git a/Papercards.pro.qtds b/Papercards.pro.qtds
diff --git a/frameworks/MacOSXBundleInfo.plist.in b/frameworks/MacOSXBundleInfo.plist.in
@@ -34,5 +34,7 @@
         <string>NSApplication</string>
         <key>NSSupportsAutomaticGraphicsSwitching</key>
         <true/>
+        <key>NSHighResolutionCapable</key>
+        <true/>
     </dict>
 </plist>
diff --git a/gui/Test.qml b/gui/Test.qml
@@ -0,0 +1,38 @@
+import QtQuick 2.12
+import QtQuick.Layouts 1.12
+import QtQuick.Controls 2.12
+
+ApplicationWindow {
+
+    id: root
+    visible: true
+    title: "Papercards"
+    width: 800
+    height: 600
+
+    ToolBar {
+        id: toolBar
+        height: 40
+        position: ToolBar.Header
+        anchors.right: parent.right
+        anchors.rightMargin: 0
+        anchors.left: parent.left
+        anchors.leftMargin: 0
+        anchors.top: parent.top
+        anchors.topMargin: 0
+    }
+
+    Switch {
+        id: element
+        x: 228
+        y: 310
+        text: qsTr("Test")
+    }
+
+}
+
+/*##^##
+Designer {
+    D{i:1;anchors_width:800;anchors_x:-6;anchors_y:0}
+}
+##^##*/
diff --git a/gui/gui.qrc b/gui/gui.qrc
@@ -16,6 +16,7 @@
         <file>components/DefaultMenuBar.qml</file>
         <file>components/NativeMenuBar.qml</file>
         <file>DialogConfirmDiscard.qml</file>
+        <file>Test.qml</file>
     </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>

diff --git a/gui/main.qml b/gui/main.qml
@@ -8,6 +8,7 @@ import io.papercards.backend 1.0
 import "components" as Components
 
 ApplicationWindow {
+//    flags: Qt.FramelessWindowHint
     property real scaleFactor: statusBar.scaleFactor
     property var targetFunction
     property bool discard: false

diff --git a/gui/qtquickcontrols2.conf b/gui/qtquickcontrols2.conf
@@ -1,5 +1,4 @@
 [Controls]
-Style=Material
 
 [Material]
 Theme=Dark

diff --git a/resources/MaterialIcons-Regular.ttf b/resources/MaterialIcons-Regular.ttf
diff --git a/resources/PapercardsIcons.ttf b/resources/PapercardsIcons.ttf
diff --git a/resources/WorkSans-Light.ttf b/resources/WorkSans-Light.ttf
diff --git a/resources/WorkSans-Regular.ttf b/resources/WorkSans-Regular.ttf
diff --git a/resources/feather.ttf b/resources/feather.ttf
diff --git a/resources/logo.png b/resources/logo.png
diff --git a/resources/logo.psd b/resources/logo.psd
diff --git a/resources/logo_old.png b/resources/logo_old.png
diff --git a/resources/resources.qrc b/resources/resources.qrc
@@ -1,21 +1,7 @@
 <RCC>
     <qresource prefix="/resources">
-        <file>WorkSans-Light.ttf</file>
-        <file>WorkSans-Regular.ttf</file>
-        <file>MaterialIcons-Regular.ttf</file>
         <file>default_deck.json</file>
         <file>logo.png</file>
-        <file>roboto/Roboto-Black.ttf</file>
-        <file>roboto/Roboto-BlackItalic.ttf</file>
-        <file>roboto/Roboto-Bold.ttf</file>
-        <file>roboto/Roboto-BoldItalic.ttf</file>
-        <file>roboto/Roboto-Italic.ttf</file>
-        <file>roboto/Roboto-Light.ttf</file>
-        <file>roboto/Roboto-LightItalic.ttf</file>
-        <file>roboto/Roboto-Medium.ttf</file>
-        <file>roboto/Roboto-MediumItalic.ttf</file>
-        <file>roboto/Roboto-Regular.ttf</file>
-        <file>roboto/Roboto-Thin.ttf</file>
-        <file>roboto/Roboto-ThinItalic.ttf</file>
+        <file>feather.ttf</file>
     </qresource>
 </RCC>
diff --git a/resources/roboto/Roboto-Black.ttf b/resources/roboto/Roboto-Black.ttf
diff --git a/resources/roboto/Roboto-BlackItalic.ttf b/resources/roboto/Roboto-BlackItalic.ttf
diff --git a/resources/roboto/Roboto-Bold.ttf b/resources/roboto/Roboto-Bold.ttf
diff --git a/resources/roboto/Roboto-BoldItalic.ttf b/resources/roboto/Roboto-BoldItalic.ttf
diff --git a/resources/roboto/Roboto-Italic.ttf b/resources/roboto/Roboto-Italic.ttf
diff --git a/resources/roboto/Roboto-Light.ttf b/resources/roboto/Roboto-Light.ttf
diff --git a/resources/roboto/Roboto-LightItalic.ttf b/resources/roboto/Roboto-LightItalic.ttf
diff --git a/resources/roboto/Roboto-Medium.ttf b/resources/roboto/Roboto-Medium.ttf
diff --git a/resources/roboto/Roboto-MediumItalic.ttf b/resources/roboto/Roboto-MediumItalic.ttf
diff --git a/resources/roboto/Roboto-Regular.ttf b/resources/roboto/Roboto-Regular.ttf
diff --git a/resources/roboto/Roboto-Thin.ttf b/resources/roboto/Roboto-Thin.ttf
diff --git a/resources/roboto/Roboto-ThinItalic.ttf b/resources/roboto/Roboto-ThinItalic.ttf
diff --git a/resources/underline-solid.svg b/resources/underline-solid.svg
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -0,0 +1,13 @@
+#include "MainWindow.h"
+#include "ui_mainwindow.h"
+
+#include <QDebug>
+
+MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::mainWindow) {
+  ui->setupUi(this);
+  setUnifiedTitleAndToolBarOnMac(true);
+}
+
+MainWindow::~MainWindow() {
+  delete ui;
+}
diff --git a/src/MainWindow.h b/src/MainWindow.h
@@ -0,0 +1,20 @@
+#ifndef MAIN_WINDOW_H
+#define MAIN_WINDOW_H
+
+#include <QMainWindow>
+
+namespace Ui {
+  class mainWindow;
+}
+
+class MainWindow : public QMainWindow {
+  Q_OBJECT
+private:
+  Ui::mainWindow *ui;
+
+public:
+  explicit MainWindow(QWidget *parent = nullptr);
+  ~MainWindow() override;
+};
+
+#endif // MAIN_WINDOW_H
diff --git a/src/SidePanel.cpp b/src/SidePanel.cpp
@@ -0,0 +1,12 @@
+#include "SidePanel.h"
+#include "ui_sidepanel.h"
+
+#include <QDebug>
+
+SidePanel::SidePanel(QWidget *parent) : QWidget(parent), ui(new Ui::sidePanel) {
+  ui->setupUi(this);
+}
+
+SidePanel::~SidePanel() {
+  delete ui;
+}
diff --git a/src/SidePanel.h b/src/SidePanel.h
@@ -0,0 +1,20 @@
+#ifndef SIDE_PANEL_H
+#define SIDE_PANEL_H
+
+#include "QWidget"
+
+namespace Ui {
+class sidePanel;
+}
+
+class SidePanel : public QWidget {
+  Q_OBJECT
+ private:
+  Ui::sidePanel *ui;
+
+ public:
+  explicit SidePanel(QWidget *parent = nullptr);
+  ~SidePanel() override;
+};
+
+#endif //SIDE_PANEL_H
diff --git a/src/Backend.cpp → src/old/Backend.cpp b/src/Backend.cpp → src/old/Backend.cpp
@@ -268,7 +268,7 @@ void BackEnd::exportAsPdf(const QUrl &fileUrl) {
   QPdfWriter writer(filePath);
   writer.setCreator("Simon Schäfer");
   writer.setPdfVersion(QPagedPaintDevice::PdfVersion_A1b);
-  writer.setResolution(130);
+  writer.setResolution(600);
   writer.setTitle("Tests Deck");
 
   QPageSize page_size = QPageSize(QPageSize::A6);
@@ -280,6 +280,7 @@ void BackEnd::exportAsPdf(const QUrl &fileUrl) {
   QPainter painter;
 
   painter.begin(&writer);
+  painter.scale(10,10);
   for (Card *card : this->cards_) {
     writer.newPage();
     QTextDocument print_document;

diff --git a/src/Backend.h → src/old/Backend.h b/src/Backend.h → src/old/Backend.h
diff --git a/src/CMakeLists.txt → src/old/CMakeLists.txt b/src/CMakeLists.txt → src/old/CMakeLists.txt
diff --git a/src/DocumentHandler.cpp → src/old/DocumentHandler.cpp b/src/DocumentHandler.cpp → src/old/DocumentHandler.cpp
diff --git a/src/DocumentHandler.h → src/old/DocumentHandler.h b/src/DocumentHandler.h → src/old/DocumentHandler.h
diff --git a/src/PdfHandler.cpp → src/old/PdfHandler.cpp b/src/PdfHandler.cpp → src/old/PdfHandler.cpp
diff --git a/src/PdfHandler.h → src/old/PdfHandler.h b/src/PdfHandler.h → src/old/PdfHandler.h
@@ -5,6 +5,7 @@
 
 class PdfHandler : public QObject {
 
+
 };
 
 #endif //PDF_HANDLER_H
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,7 @@

		class PdfHandler : public QObject {


		};

		#endif //PDF_HANDLER_H