Resized main window and added version info.
This commit is contained in:
parent
a25bedd770
commit
3a0367a79c
@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required(VERSION 2.8.9)
|
cmake_minimum_required(VERSION 2.8.9)
|
||||||
project(multimc5)
|
project(MultiMC5)
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
@ -105,6 +105,7 @@ data/inifile.cpp
|
|||||||
data/instancebase.cpp
|
data/instancebase.cpp
|
||||||
data/instancemodel.cpp
|
data/instancemodel.cpp
|
||||||
data/stdinstance.cpp
|
data/stdinstance.cpp
|
||||||
|
data/version.cpp
|
||||||
|
|
||||||
gui/mainwindow.cpp
|
gui/mainwindow.cpp
|
||||||
gui/modeditwindow.cpp
|
gui/modeditwindow.cpp
|
||||||
@ -126,6 +127,7 @@ data/inifile.h
|
|||||||
data/instancebase.h
|
data/instancebase.h
|
||||||
data/instancemodel.h
|
data/instancemodel.h
|
||||||
data/stdinstance.h
|
data/stdinstance.h
|
||||||
|
data/version.h
|
||||||
|
|
||||||
util/apputils.h
|
util/apputils.h
|
||||||
util/pathutils.h
|
util/pathutils.h
|
||||||
@ -152,8 +154,8 @@ SET_SOURCE_FILES_PROPERTIES(resources/MultiMCLauncher.jar GENERATED)
|
|||||||
QT5_WRAP_UI(MULTIMC_UI ${MULTIMC5_UIS})
|
QT5_WRAP_UI(MULTIMC_UI ${MULTIMC5_UIS})
|
||||||
QT5_ADD_RESOURCES(MULTIMC_QRC multimc.qrc)
|
QT5_ADD_RESOURCES(MULTIMC_QRC multimc.qrc)
|
||||||
|
|
||||||
add_executable(multimc5 ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC})
|
add_executable(MultiMC ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC})
|
||||||
qt5_use_modules(multimc5 Widgets)
|
qt5_use_modules(MultiMC Widgets)
|
||||||
target_link_libraries(multimc5 quazip patchlib)
|
target_link_libraries(MultiMC quazip patchlib)
|
||||||
add_dependencies(multimc5 MultiMCLauncher)
|
add_dependencies(MultiMC MultiMCLauncher)
|
||||||
install(TARGETS multimc5 RUNTIME DESTINATION bin)
|
install(TARGETS MultiMC RUNTIME DESTINATION bin)
|
||||||
|
38
data/version.cpp
Normal file
38
data/version.cpp
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
/* Copyright 2013 MultiMC Contributors
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
Version Version::current = Version(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD);
|
||||||
|
|
||||||
|
Version::Version(int major, int minor, int revision, int build, QObject *parent) :
|
||||||
|
QObject(parent)
|
||||||
|
{
|
||||||
|
this->major = major;
|
||||||
|
this->minor = minor;
|
||||||
|
this->revision = revision;
|
||||||
|
this->build = build;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Version::toString() const
|
||||||
|
{
|
||||||
|
return QString("%1.%2.%3.%4").arg(
|
||||||
|
QString::number(major),
|
||||||
|
QString::number(minor),
|
||||||
|
QString::number(revision),
|
||||||
|
QString::number(build));
|
||||||
|
}
|
38
data/version.h
Normal file
38
data/version.h
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
/* Copyright 2013 MultiMC Contributors
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef VERSION_H
|
||||||
|
#define VERSION_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
class Version : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit Version(int major = 0, int minor = 0, int revision = 0,
|
||||||
|
int build = 0, QObject *parent = 0);
|
||||||
|
|
||||||
|
QString toString() const;
|
||||||
|
|
||||||
|
int major;
|
||||||
|
int minor;
|
||||||
|
int revision;
|
||||||
|
int build;
|
||||||
|
|
||||||
|
static Version current;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // VERSION_H
|
@ -19,13 +19,17 @@
|
|||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
|
|
||||||
#include "../gui/settingsdialog.h"
|
#include "gui/settingsdialog.h"
|
||||||
|
#include "data/version.h"
|
||||||
|
|
||||||
MainWindow::MainWindow(QWidget *parent) :
|
MainWindow::MainWindow(QWidget *parent) :
|
||||||
QMainWindow(parent),
|
QMainWindow(parent),
|
||||||
ui(new Ui::MainWindow)
|
ui(new Ui::MainWindow)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
setWindowTitle(QString("MultiMC %1").arg(Version::current.toString()));
|
||||||
|
|
||||||
instList.initialLoad("instances");
|
instList.initialLoad("instances");
|
||||||
ui->instanceView->setModel(&instList);
|
ui->instanceView->setModel(&instList);
|
||||||
}
|
}
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>739</width>
|
<width>854</width>
|
||||||
<height>657</height>
|
<height>480</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
Loading…
Reference in New Issue
Block a user