d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove MainWindow ui form

Browse source
This commit is contained in:
Konstantinos Sideris 2017-05-14 21:10:03 +03:00
parent e5ef84617c
commit a568d60cef
4 changed files with 12 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -150,7 +150,6 @@ include_directories(include/events/messages)
qt5_wrap_ui (UI_HEADERS qt5_wrap_ui (UI_HEADERS
forms/ChatPage.ui forms/ChatPage.ui
forms/MainWindow.ui
forms/RoomList.ui forms/RoomList.ui
) )

42
forms/MainWindow.ui
View file

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1066</width>
<height>600</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>950</width>
<height>600</height>
</size>
</property>
<property name="font">
<font>
<family>Open Sans</family>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="windowTitle">
<string notr="true"> nheko </string>
</property>
<property name="styleSheet">
<string notr="true">background-color: #f9f9f9</string>
</property>
<widget class="QWidget" name="centralWidget"/>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>

8
include/MainWindow.h
View file

@ -30,11 +30,6 @@
#include "SlidingStackWidget.h" #include "SlidingStackWidget.h"
#include "WelcomePage.h" #include "WelcomePage.h"
namespace Ui
{
class MainWindow;
}
class MainWindow : public QMainWindow class MainWindow : public QMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -59,9 +54,6 @@ private slots:
void removeOverlayProgressBar(); void removeOverlayProgressBar();
private: private:
// The UI component of the main window.
Ui::MainWindow *ui_;
// The initial welcome screen. // The initial welcome screen.
WelcomePage *welcome_page_; WelcomePage *welcome_page_;

17
src/MainWindow.cc
View file

@ -16,7 +16,6 @@
*/ */
#include "MainWindow.h" #include "MainWindow.h"
#include "ui_MainWindow.h"
#include <QLayout> #include <QLayout>
#include <QNetworkReply> #include <QNetworkReply>
@ -24,15 +23,24 @@
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
, ui_(new Ui::MainWindow)
, progress_modal_{nullptr} , progress_modal_{nullptr}
, spinner_{nullptr} , spinner_{nullptr}
{ {
ui_->setupUi(this); QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
setSizePolicy(sizePolicy);
setWindowTitle("nheko");
resize(1066, 600); // 16:9 ratio
setMinimumSize(QSize(950, 600));
setStyleSheet("background-color: #f9f9f9");
QFont font("Open Sans", 12);
font.setStyleStrategy(QFont::PreferAntialias);
setFont(font);
client_ = QSharedPointer<MatrixClient>(new MatrixClient("matrix.org")); client_ = QSharedPointer<MatrixClient>(new MatrixClient("matrix.org"));
welcome_page_ = new WelcomePage(this); welcome_page_ = new WelcomePage(this);
login_page_ = new LoginPage(client_, this); login_page_ = new LoginPage(client_, this);
register_page_ = new RegisterPage(client_, this); register_page_ = new RegisterPage(client_, this);
chat_page_ = new ChatPage(client_, this); chat_page_ = new ChatPage(client_, this);
@ -153,5 +161,4 @@ void MainWindow::showRegisterPage()
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
delete ui_;
} }